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
Seth Vargo
48bf346c9b
Update CHANGELOG
2015-01-14 11:54:40 -05:00
Seth Vargo
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
Volodymyr Babchynskyy
551a26272b
tests extended to new variables
2015-01-14 17:35:44 +02:00
Volodymyr Babchynskyy
a9ac168b19
Added possibility to configure memory, cpus count, and vmname in vagrantfile
2015-01-14 16:59:01 +02:00
Clinton Wolfe
75de0e3dd7
Add insert/remove public key guest capability for solaris (identical to linux)
2015-01-13 21:45:06 -05:00
Seth Vargo
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
Clinton Wolfe
17a0d08040
Add chef_install(ed?) guest capability for omnios
2015-01-13 17:45:01 -05:00
Gilles Cornu
5b716d1623
provisioners/ansible: fix lines lengths in docs
...
[ci skip]
2015-01-13 19:18:32 +01:00
Gilles Cornu
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
Gilles Cornu
cdd5d54208
provisioners/ansible: fix a typo in a comment
...
[ci skip]
2015-01-13 18:52:47 +01:00
Seth Vargo
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
Seth Vargo
80918c96ca
Finish that sentence
2015-01-12 12:34:40 -05:00
Seth Vargo
d461d5a752
Improve the documentation around install VMware plugins + FAQ
2015-01-12 12:32:09 -05:00
Hubert
7e5391c0f5
synced/folders/rsync Add 'IdentitiesOnly=yes'
...
Added IdentiesOnly=yes to avoid "Too Many Authentication Failures" error
2015-01-12 15:19:43 +01:00
Gilles Cornu
9874a0db5f
Fix a second typo error in CHANGELOG !!
...
Close #5018
[ci skip]
2015-01-12 11:01:07 +01:00
Gilles Cornu
28e0646dc2
Fix typo error in CHANGELOG
...
Close #4860
[ci skip]
2015-01-12 10:59:07 +01:00
Gilles Cornu
2ecad8bb93
provisioners/ansible: increase connection timeout
...
This change helps to avoid troubles like reported in #5018 and #4860 .
Note that for sake of configuration simplicity, no new `ansible.timeout`
option has been added. The users who want to set a different value can
rely on `ansible.raw_arguments`.
2015-01-12 10:54:01 +01:00
Gilles Cornu
fafaa00391
doc: update ansible parallel provisioning tip
...
As of Vagrant 1.7+, the ansible parallel provisioning trick is easier to
be implemented with `config.ssh.insert_key=false` (fallback to previous
behaviour).
Close #5048
[ci skip]
2015-01-12 10:29:58 +01:00
Gilles Cornu
9d74dcdb3d
provisioners/ansible: add missing test coverage
...
Related to Docker provider on a non-linux host, see #4906 and #4071 .
2015-01-12 09:37:16 +01:00
Gilles Cornu
c3cae3d235
provisioners/ansible: add `IdentitiesOnly=yes`
...
This SSH option is always set, except when Vagrant is running from an
operating system fo the Solaris-family, as this parameter is not
supported by SunSSH. Logic taken from
bed1f8335f/lib/vagrant/util/ssh.rb (L116-L121)
Fix #5017
2015-01-12 08:58:29 +01:00
Tomas Srnka
4c35f6b070
Revert "Added config option to specify VLanId for Network Adapter when using HyperV provider"
...
This reverts commit 2a487af68d
.
2015-01-11 18:10:46 +01:00
Tomas Srnka
2a487af68d
Added config option to specify VLanId for Network Adapter when using HyperV provider
2015-01-11 18:04:17 +01:00
Seth Vargo
49d1a92bf6
Update CHANGELOG
2015-01-09 13:34:33 -05:00
Seth Vargo
cfdcb16718
Merge pull request #5145 from mitchellh/sethvargo/token_login
...
Allow specifying a token at login
2015-01-09 13:33:37 -05:00
Seth Vargo
114858c7d2
Verify the token is valid when saving
2015-01-09 13:24:53 -05:00
Mitchell Hashimoto
a9a7609b3e
Merge pull request #5147 from obnoxxx/fix/master/readme_improve_wording
...
README: improve wording.
2015-01-09 08:11:26 -08:00
Mitchell Hashimoto
7a006a3093
Merge pull request #5146 from peterood/master
...
fix typo
2015-01-09 08:06:07 -08:00