76df3ced03
synced_folders/nfs: style
2013-12-06 15:07:55 -08:00
55931d507e
Merge branch 'nfs-sync-folder-cleanup' of https://github.com/emyl/vagrant into emyl-nfs-sync-folder-cleanup
...
Conflicts:
plugins/providers/virtualbox/action.rb
2013-12-06 15:06:34 -08:00
f3d71de022
Merge pull request #2591 from instilled/arch-netctl-fix
...
guests/arch: netctl fix
2013-12-06 15:02:41 -08:00
89f4e14ab3
Merge pull request #2585 from mitchellh/2585-fix-docker-image-assignment
...
provisioner/docker: unable to run multiple docker containers based off the same image
2013-12-06 14:56:15 -08:00
b0919b916b
Remove extraneous character
...
Going down? ;)
2013-12-06 18:57:27 -03:00
5b7a4d7f6e
Merge pull request #2596 from tmatilai/fix-initctl-test
...
guests/linux: fix testing if initctl exists
2013-12-06 13:22:03 -08:00
b65462faf1
providers/virtualbox: resume should wait for boot
2013-12-06 13:21:07 -08:00
c566465bdc
Fix testing if initctl exists
...
If /sbin/initctl was not found, the command (`false && ...`) returned
non-zero exit code leading to Vagrant throwing an exception.
2013-12-06 18:17:41 -03:00
17b68f7d50
provisioners/puppet: use unique directory for each definition
2013-12-06 12:39:50 -08:00
f8223d4704
provisioners/chef: support proper counter for multiple chefs
2013-12-06 12:26:48 -08:00
38f931ba93
provisioners/shell: array args properly work
2013-12-06 11:28:32 -08:00
47b99d9bb8
test/acceptance: don't have the context show up as a component
2013-12-05 21:44:19 -08:00
6d7a2fe113
website/docs: Add some links to Docker provisioner page
2013-12-05 22:14:57 -02:00
bdd4e82e49
website/docs: Add an example on how to run multiple containers based off the same image
2013-12-05 22:13:46 -02:00
8688c6b8b2
provisioners/docker: Only assign the `image` config in case it was not specified
2013-12-05 22:12:44 -02:00
b484c8d628
Merge branch 'f-acceptance'
...
This brings in the new acceptance testing style. See the README.
2013-12-05 14:33:12 -08:00
77100ad417
Update gemfile for others
2013-12-05 14:33:06 -08:00
3a15cdd8e4
Update README
2013-12-05 14:31:25 -08:00
fd62251157
update rake tasks for acceptance testing
2013-12-05 14:24:10 -08:00
5a0fdec789
test/acceptance: set the VBOX_USER_HOME
2013-12-05 13:39:33 -08:00
0d02ada43b
providers/virtualbox: only clear shared folders if we have a VM
2013-12-05 13:39:23 -08:00
dbfce21e05
Start acceptance test config stuff
2013-12-05 13:19:15 -08:00
6b1493ec3f
Merge branch 'master' of github.com:mitchellh/vagrant
2013-12-05 12:36:32 -08:00
23ef5a8b74
Merge pull request #2594 from johnbellone/patch-1
...
provisioner/chef: Update base to fix typo.
2013-12-05 12:34:51 -08:00
bebaa63063
[provisioner/chef]: Update base to fix typo.
...
It seems this was introduced by accident with #2281 .
2013-12-05 15:24:53 -05:00
f715b61d15
Merge pull request #2593 from bennlich/patch-1
...
fixed broken link on configuration version page
2013-12-05 10:05:18 -08:00
2f6d09af1a
fixed broken link
2013-12-05 10:02:29 -08:00
2a75c34d62
systemctl wasn't a good idea
2013-12-05 16:01:44 +01:00
158d82ea39
Avoid udev rule masking and configure ifaces with sed instead.
2013-12-05 15:16:59 +01:00
6f187c898a
Merge pull request #2586 from tmatilai/2577-synced-folder
...
provider/virtualbox: add missing argument to ProviderVirtualBox::SyncedFolder#driver call
2013-12-04 19:41:30 -08:00
897fde3274
Add missing argument to ProviderVirtualBox::SyncedFolder#driver call
...
GH-2577 missed passing the `machine` to the `driver` method.
2013-12-05 00:21:16 -03:00
1b847b7829
Merge pull request #2579 from mitchellh/2579-fix-docker-container-running-check
...
provisioners/docker: Check for whether the container is running is not working properly
2013-12-04 18:46:37 -08:00
7e0b0a5a3c
provisioners/docker: Extract container lookup method
2013-12-04 22:13:17 -02:00
c7a5592b96
provisioners/docker: Ensure checks for whether the container exists / is running works accross multiple Docker versions [GH-2579]
2013-12-04 22:10:39 -02:00
944130b8c6
move test/acceptance to test/acceptance_old
2013-12-04 15:35:50 -08:00
20f2e65be4
Merge pull request #2583 from tmatilai/plugin-regressions
...
commands/plugin: fix plugin regressions for new state file
2013-12-04 14:23:51 -08:00
294f4def91
Fix `vagrant plugin` commands
...
`StateFile#installed_plugins` returns now a Hash instead of Array.
Fixes regression from 39b2539
2013-12-04 18:25:33 -03:00
ee8f962537
Fix plugin loading
...
Regression from d354cdd
2013-12-04 18:25:29 -03:00
3df245f1fd
provisioners/chef: create/chown backup folders [GH-2281]
2013-12-04 11:51:05 -08:00
d354cdda4a
core: request users upgrade plugins if they're old
2013-12-04 11:43:39 -08:00
236141ba90
commands/plugin: old state files default to 0 for vagrant version
2013-12-04 11:29:17 -08:00
39b2539ec7
commands/plugin: state file keeps track of the Vagrant version
2013-12-04 11:17:48 -08:00
b2844d420d
commands/plugin: tests for state file
2013-12-04 10:50:19 -08:00
df540e4a78
Merge pull request #2581 from phinze/ssh-config-support-multiple-keys
...
commands/ssh-config: fix for multiple private keys
2013-12-04 07:46:23 -08:00
2566373815
Merge pull request #2577 from emyl/vbox-sync-folder-cleanup
...
providers/virtualbox: remove dedicated cleanup action for shared folders
2013-12-04 07:42:30 -08:00
ec97a45125
commands/ssh-config: fix for multiple private keys
...
since we merged multiple private keys, the :private_key_path item of
ssh_info now comes back as an array. the ssh-config command had not yet
been updated to handle this properly.
here we fix that oversight and add a few unit tests around the config
generation.
2013-12-04 09:33:27 -06:00
07bbca426e
NFS/VBox: remove dedicated cleanup action in favour of native routine.
2013-12-04 12:29:09 +01:00
c95fc4e27c
VirtualBox shared folders: remove dedicated cleanup action in favour of native routine.
2013-12-04 12:22:01 +01:00
4f17a70c4e
commands/plugin: ignore default gems when pruning
...
For modern RubyGems compatibility
2013-12-03 23:48:06 -08:00
255608d9c5
core: note Ruby and RubyGems version in logs
2013-12-03 23:44:08 -08:00
Mitchell Hashimoto
Teemu Matilainen
Fabio Rehm
John Bellone
Benny Lichtner
me
Paul Hinze
Emiliano Ticci