259568f68a
Clarified multiple additional options are possible
...
Updated additional options section to clarify that multiple options can be specified, not just "a third" as originally suggested.
2015-01-22 13:44:14 -06:00
d023408f78
Update CHANGELOG
2015-01-21 17:25:55 -08:00
fa38b59049
Merge pull request #5233 from mitchellh/virtualbox-dhcpserver-netmask
...
providers/virtualbox: read netmask from dhcpservers
2015-01-21 17:11:09 -08:00
daeaf25858
Do no minify HTML on websites
2015-01-21 17:01:44 -05:00
96d1285b4f
Use 2014 for the license upgrade center URL
2015-01-21 16:55:28 -05:00
86d27528b3
Update CHANGELOG
2015-01-21 16:05:51 -05:00
3f95d5de9f
Merge pull request #5221 from simonvetter/svetter/fixBoxChecksums
...
fix checksum verification for downloaded boxes (fixes #4665 )
2015-01-21 16:05:07 -05:00
1bc364febc
add test for checksum options mapping
2015-01-21 21:40:25 +01:00
88ab9f7402
providers/virtualbox: read netmask from dhcpservers
...
This should fix the cleaning up of the default VirtualBox dhcpserver,
which we've been fighting with for ages over in #3083 . We were checking
for a structure _including_ a netmask, but the driver was not populating
netmask.
2015-01-21 10:51:39 -08:00
ce4525e7fd
Clean up words a bit
2015-01-21 10:26:27 -05:00
cc63ba34cb
Merge pull request #5230 from berendt/issue_5228
...
Add a note to the "external script" section how to run existing scripts
2015-01-21 10:25:37 -05:00
58435b7dca
Add a note to the "external script" section how to run existing scripts
...
Closes-bug: #5228
2015-01-21 16:22:10 +01:00
29845e926c
Merge branch 'master' into winrm_error_handling
2015-01-20 16:16:48 -05:00
2b810c3ccc
WinRM 1.3 released w/ proper SSL support
2015-01-20 16:07:20 -05:00
edc867986b
Merge branch 'master' into winrm_error_handling
2015-01-20 16:07:00 -05:00
0cf454503d
WinRM 1.3 released w/ proper SSL support
2015-01-20 16:03:09 -05:00
e07f229f6e
Merge branch 'master' of github.com:mitchellh/vagrant into winrmssl
2015-01-20 16:00:20 -05:00
31163da0d5
Use winrm-fs for file uploads
...
Replace the Vagrant native winrm file upload functionality with the winrm-fs gem.
2015-01-20 11:45:57 -08:00
3c6c496bb0
Update CHANGELOG
2015-01-20 11:25:00 -05:00
6783267e8e
Merge pull request #5218 from mbrodala/patch-1
...
Check plugin name with version spec in has_plugin
2015-01-20 11:24:11 -05:00
e756950e2a
Extend has_plugin test for gem name and version
...
The test must ensure that has_plugin does not succeed if an unrelated plugin satisfies the given version spec.
2015-01-20 16:35:57 +01:00
bb700efe40
Update CHANGELOG
2015-01-20 09:59:14 -05:00
0cfe5ebfa6
Merge pull request #5222 from simonjbeaumont/fix-regex
...
Allow colon in NFS ID regex
2015-01-20 09:58:31 -05:00
61e501b2c1
Update CHANGELOG
2015-01-20 09:55:09 -05:00
8519e174f0
Merge pull request #5220 from voxik/fix-permissions
...
Remove unneeded executable permissions.
2015-01-20 09:53:48 -05:00
7fb9409aa1
Merge pull request #5216 from clayallsopp/switch-docker-io-com
...
Switch to docker.com
2015-01-20 09:49:30 -05:00
3deed353ae
Allow colon in NFS ID regex
...
Signed-off-by: Si Beaumont <simon.beaumont@citrix.com>
2015-01-20 14:11:42 +00:00
40eb978931
fix checksum verification for downloaded boxes ( fixes #4665 )
...
This makes sure that config.vm.box_download_checksum and
config.vm.box_download_checksum_type get passed to
Vagrant::Action.action_box_add with other options on
box download/import.
2015-01-20 14:28:29 +01:00
7d3b5352da
Remove unneeded executable permissions.
2015-01-20 11:53:30 +01:00
cca19f8241
Check plugin name with version spec in has_plugin
...
If one passes a version spec to `Vagrant.has_plugin?`, the actual plugin name is ignored and any installed plugin which matches the version spec makes the check pass. Fix this by also checking for plugin name match in addition to the requested version spec.
2015-01-20 08:37:22 +01:00
69b7200c35
Switch to docker.com
...
docker.io seems to be deprecated & handled differently from docker.com; see https://twitter.com/clint_newsom/status/557290529810313217
2015-01-19 13:58:45 -08:00
21e2f33fb0
Fix for: [hyperv]: VM import process does not respect Secure Boot option from image #5209
2015-01-17 21:31:37 +01:00
a2322c489e
Merge remote-tracking branch 'upstream/master'
2015-01-17 21:27:55 +01:00
87195f8336
use :bridge instead of network_name to align with site docs
2015-01-17 11:39:32 -08:00
0b6e65380a
select a switch ased on a network_name
2015-01-17 01:06:56 -08:00
4cd767afcc
Merge pull request #5201 from mitchellh/3031-catch-errno-eaccess
...
Fix issue 3031
2015-01-16 12:58:07 -08:00
522bf9ff8b
Fix issue 3031
...
Sometimes in use ports can raise a Errno::EACCES exeptions on Windows hosts.
2015-01-16 08:03:37 -08:00
21736aa5d4
Merge pull request #5190 from thierrymarianne/master
...
Add missing comma in folder syncing code snippet
2015-01-15 10:25:05 -05:00
2791843a90
Add missing comma in folder syncing code snippet
2015-01-15 15:51:04 +01:00
48bf346c9b
Update CHANGELOG
2015-01-14 11:54:40 -05:00
507c0d65a5
Merge pull request #5183 from vvchik/feature/hyperv-memory-and-cpu-management
...
Added possibility to configure memory, cpus count, and vmname in vagrant...
2015-01-14 11:53:44 -05:00
551a26272b
tests extended to new variables
2015-01-14 17:35:44 +02:00
a9ac168b19
Added possibility to configure memory, cpus count, and vmname in vagrantfile
2015-01-14 16:59:01 +02:00
75de0e3dd7
Add insert/remove public key guest capability for solaris (identical to linux)
2015-01-13 21:45:06 -05:00
ea8de92c59
Merge pull request #5179 from clintoncwolfe/add-chef-install-for-omnios
...
Add chef_install(ed?) guest capability for omnios
2015-01-13 21:23:17 -05:00
17a0d08040
Add chef_install(ed?) guest capability for omnios
2015-01-13 17:45:01 -05:00
5b716d1623
provisioners/ansible: fix lines lengths in docs
...
[ci skip]
2015-01-13 19:18:32 +01:00
00b848fd71
provisioners/ansible: improve inventory docs
...
Related to a question asked in the mailing list:
https://groups.google.com/forum/#!topic/vagrant-up/OwkR04u4MA4
[ci skip]
2015-01-13 19:18:23 +01:00
cdd5d54208
provisioners/ansible: fix a typo in a comment
...
[ci skip]
2015-01-13 18:52:47 +01:00
e37918e42e
Merge pull request #5176 from mitchellh/sethvargo/vmware_install
...
Improve the documentation around install VMware plugins + FAQ
2015-01-12 12:55:31 -05:00
dragon788
Paul Hinze
Paul Hinze
Seth Vargo
Simon Vetter
Christian Berendt
Max Lincoln
Shawn Neal
mbrodala
Si Beaumont
Vít Ondruch
Clay Allsopp
Tomas Srnka
Matt Wrock
Thierry Marianne
Volodymyr Babchynskyy
Clinton Wolfe
Gilles Cornu