haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,405 Commits 8 Branches 143 Tags 51 MiB
Commit Graph

4405 Commits

Author SHA1 Message Date
Mitchell Hashimoto ab3fec6ef8 Merge pull request #2601 from mattalexx/fix-issue-2599 
guests/arch: run "ip link set [eth1] down" before running "netctl start [eth1]"
 2013-12-07 16:58:01 -08:00
Matt Alexander edeb5f0e9f Add the symlink back that disabled renaming of network interface names 2013-12-07 14:59:40 -06:00
Matt Alexander df67d2b44f Run "ip link set [eth1] down" before running "netctl start [eth1]" in Arch guest network configuration 2013-12-07 14:22:19 -06:00
Mitchell Hashimoto 5bf07d858e website/docs: affil links to book 2013-12-06 17:48:04 -08:00
Mitchell Hashimoto d80f32c20f synced_folders/nfs: allow plugins to provide valid NFS ids 2013-12-06 16:42:34 -08:00
Mitchell Hashimoto 2c65d247da core: Allow options to be passed down into SF cleanup 2013-12-06 16:40:24 -08:00
Mitchell Hashimoto deb6ba07b2 scripts: bintray upload 2013-12-06 15:29:54 -08:00
Mitchell Hashimoto 76df3ced03 synced_folders/nfs: style 2013-12-06 15:07:55 -08:00
Mitchell Hashimoto 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
Mitchell Hashimoto f3d71de022 Merge pull request #2591 from instilled/arch-netctl-fix 
guests/arch: netctl fix
 2013-12-06 15:02:41 -08:00
Mitchell Hashimoto 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
Teemu Matilainen b0919b916b Remove extraneous character 
Going down? ;)
 2013-12-06 18:57:27 -03:00
Mitchell Hashimoto 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
Mitchell Hashimoto b65462faf1 providers/virtualbox: resume should wait for boot 2013-12-06 13:21:07 -08:00
Teemu Matilainen 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
Mitchell Hashimoto 17b68f7d50 provisioners/puppet: use unique directory for each definition 2013-12-06 12:39:50 -08:00
Mitchell Hashimoto f8223d4704 provisioners/chef: support proper counter for multiple chefs 2013-12-06 12:26:48 -08:00
Mitchell Hashimoto 38f931ba93 provisioners/shell: array args properly work 2013-12-06 11:28:32 -08:00
Mitchell Hashimoto 47b99d9bb8 test/acceptance: don't have the context show up as a component 2013-12-05 21:44:19 -08:00
Fabio Rehm 6d7a2fe113 website/docs: Add some links to Docker provisioner page 2013-12-05 22:14:57 -02:00
Fabio Rehm 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
Fabio Rehm 8688c6b8b2 provisioners/docker: Only assign the `image` config in case it was not specified 2013-12-05 22:12:44 -02:00
Mitchell Hashimoto b484c8d628 Merge branch 'f-acceptance' 
This brings in the new acceptance testing style. See the README.
 2013-12-05 14:33:12 -08:00
Mitchell Hashimoto 77100ad417 Update gemfile for others 2013-12-05 14:33:06 -08:00
Mitchell Hashimoto 3a15cdd8e4 Update README 2013-12-05 14:31:25 -08:00
Mitchell Hashimoto fd62251157 update rake tasks for acceptance testing 2013-12-05 14:24:10 -08:00
Mitchell Hashimoto 5a0fdec789 test/acceptance: set the VBOX_USER_HOME 2013-12-05 13:39:33 -08:00
Mitchell Hashimoto 0d02ada43b providers/virtualbox: only clear shared folders if we have a VM 2013-12-05 13:39:23 -08:00
Mitchell Hashimoto dbfce21e05 Start acceptance test config stuff 2013-12-05 13:19:15 -08:00
Mitchell Hashimoto 6b1493ec3f Merge branch 'master' of github.com:mitchellh/vagrant 2013-12-05 12:36:32 -08:00
Mitchell Hashimoto 23ef5a8b74 Merge pull request #2594 from johnbellone/patch-1 
provisioner/chef: Update base to fix typo.
 2013-12-05 12:34:51 -08:00
John Bellone 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
Fabio Rehm f715b61d15 Merge pull request #2593 from bennlich/patch-1 
fixed broken link on configuration version page
 2013-12-05 10:05:18 -08:00
Benny Lichtner 2f6d09af1a fixed broken link 2013-12-05 10:02:29 -08:00
me 2a75c34d62 systemctl wasn't a good idea 2013-12-05 16:01:44 +01:00
me 158d82ea39 Avoid udev rule masking and configure ifaces with sed instead. 2013-12-05 15:16:59 +01:00
Mitchell Hashimoto 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
Teemu Matilainen 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
Mitchell Hashimoto 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
Fabio Rehm 7e0b0a5a3c provisioners/docker: Extract container lookup method 2013-12-04 22:13:17 -02:00
Fabio Rehm 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
Mitchell Hashimoto 944130b8c6 move test/acceptance to test/acceptance_old 2013-12-04 15:35:50 -08:00
Mitchell Hashimoto 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
Teemu Matilainen 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
Teemu Matilainen ee8f962537 Fix plugin loading 
Regression from d354cdd.
 2013-12-04 18:25:29 -03:00
Mitchell Hashimoto 3df245f1fd provisioners/chef: create/chown backup folders [GH-2281] 2013-12-04 11:51:05 -08:00
Mitchell Hashimoto d354cdda4a core: request users upgrade plugins if they're old 2013-12-04 11:43:39 -08:00
Mitchell Hashimoto 236141ba90 commands/plugin: old state files default to 0 for vagrant version 2013-12-04 11:29:17 -08:00
Mitchell Hashimoto 39b2539ec7 commands/plugin: state file keeps track of the Vagrant version 2013-12-04 11:17:48 -08:00
Mitchell Hashimoto b2844d420d commands/plugin: tests for state file 2013-12-04 10:50:19 -08:00