Max Lincoln
5d5e13bc0f
Change authorization error tests to match WinRM 1.3
2015-01-28 13:41:07 -05:00
Richard Guin
56a6c85e7d
Windows rsync needs to create folders before syncing
2015-01-28 13:07:36 -05:00
Max Lincoln
c37c12526a
Merge branch 'master' of github.com:mitchellh/vagrant into winrm_error_handling
...
Conflicts:
vagrant.gemspec
2015-01-28 10:44:47 -05:00
Shawn Neal
6378deacd6
Merge pull request #5225 from mitchellh/winrm-fs-dependency
...
Use winrm-fs for file uploads
2015-01-26 09:55:31 -08:00
Mitchell Hashimoto
37b60f54ea
Merge pull request #5244 from mitchellh/log-action-name
...
core: log action name to info
2015-01-24 14:17:32 -08:00
Paul Hinze
dfbcebef0b
core: log action name to info
...
I found this output to be very helpful in debugging an action hook
problem in a plugin. problem. I'm not sure why the callable_id is
useful (seem to always show up as an instance of `Builder` or `Warden`
for me), but I left it in there just in case it's useful to someone.
2015-01-24 09:59:48 -08:00
Seth Vargo
64f81af889
Merge pull request #5238 from dragon788/master
...
Updated wording around synced folder optional arguments
2015-01-22 15:31:54 -05:00
dragon788
f9a53a2c27
Clarified wording a little bit further
2015-01-22 14:16:44 -06:00
dragon788
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
Paul Hinze
d023408f78
Update CHANGELOG
2015-01-21 17:25:55 -08:00
Paul Hinze
fa38b59049
Merge pull request #5233 from mitchellh/virtualbox-dhcpserver-netmask
...
providers/virtualbox: read netmask from dhcpservers
2015-01-21 17:11:09 -08:00
Seth Vargo
daeaf25858
Do no minify HTML on websites
2015-01-21 17:01:44 -05:00
Seth Vargo
96d1285b4f
Use 2014 for the license upgrade center URL
2015-01-21 16:55:28 -05:00
Seth Vargo
86d27528b3
Update CHANGELOG
2015-01-21 16:05:51 -05:00
Seth Vargo
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
Simon Vetter
1bc364febc
add test for checksum options mapping
2015-01-21 21:40:25 +01:00
Paul Hinze
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
Seth Vargo
ce4525e7fd
Clean up words a bit
2015-01-21 10:26:27 -05:00
Seth Vargo
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
Christian Berendt
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
Max Lincoln
a317a4d50d
Ensure allowed_synced_folder_types is a list of symbols
2015-01-20 16:18:05 -05:00
Max Lincoln
853042f2fa
Make sure allowed_synced_folder_types order overrides priority
2015-01-20 16:18:05 -05:00
Max Lincoln
d781dce8f8
Filter synced folders by allowed_synced_folder_types
2015-01-20 16:18:05 -05:00
Max Lincoln
29845e926c
Merge branch 'master' into winrm_error_handling
2015-01-20 16:16:48 -05:00
Max Lincoln
2b810c3ccc
WinRM 1.3 released w/ proper SSL support
2015-01-20 16:07:20 -05:00
Max Lincoln
edc867986b
Merge branch 'master' into winrm_error_handling
2015-01-20 16:07:00 -05:00
Max Lincoln
0cf454503d
WinRM 1.3 released w/ proper SSL support
2015-01-20 16:03:09 -05:00
Max Lincoln
e07f229f6e
Merge branch 'master' of github.com:mitchellh/vagrant into winrmssl
2015-01-20 16:00:20 -05:00
Shawn Neal
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
Seth Vargo
3c6c496bb0
Update CHANGELOG
2015-01-20 11:25:00 -05:00
Seth Vargo
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
mbrodala
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
Seth Vargo
bb700efe40
Update CHANGELOG
2015-01-20 09:59:14 -05:00
Seth Vargo
0cfe5ebfa6
Merge pull request #5222 from simonjbeaumont/fix-regex
...
Allow colon in NFS ID regex
2015-01-20 09:58:31 -05:00
Seth Vargo
61e501b2c1
Update CHANGELOG
2015-01-20 09:55:09 -05:00
Seth Vargo
8519e174f0
Merge pull request #5220 from voxik/fix-permissions
...
Remove unneeded executable permissions.
2015-01-20 09:53:48 -05:00
Seth Vargo
7fb9409aa1
Merge pull request #5216 from clayallsopp/switch-docker-io-com
...
Switch to docker.com
2015-01-20 09:49:30 -05:00
Si Beaumont
3deed353ae
Allow colon in NFS ID regex
...
Signed-off-by: Si Beaumont <simon.beaumont@citrix.com>
2015-01-20 14:11:42 +00:00
Simon Vetter
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
Vít Ondruch
7d3b5352da
Remove unneeded executable permissions.
2015-01-20 11:53:30 +01:00
mbrodala
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
Clay Allsopp
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
Tomas Srnka
21e2f33fb0
Fix for: [hyperv]: VM import process does not respect Secure Boot option from image #5209
2015-01-17 21:31:37 +01:00
Tomas Srnka
a2322c489e
Merge remote-tracking branch 'upstream/master'
2015-01-17 21:27:55 +01:00
Matt Wrock
87195f8336
use :bridge instead of network_name to align with site docs
2015-01-17 11:39:32 -08:00
Matt Wrock
0b6e65380a
select a switch ased on a network_name
2015-01-17 01:06:56 -08:00
Shawn Neal
4cd767afcc
Merge pull request #5201 from mitchellh/3031-catch-errno-eaccess
...
Fix issue 3031
2015-01-16 12:58:07 -08:00
Shawn Neal
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
Seth Vargo
21736aa5d4
Merge pull request #5190 from thierrymarianne/master
...
Add missing comma in folder syncing code snippet
2015-01-15 10:25:05 -05:00
Thierry Marianne
2791843a90
Add missing comma in folder syncing code snippet
2015-01-15 15:51:04 +01:00