Commit Graph

6065 Commits

Author SHA1 Message Date
Mitchell Hashimoto 42453c1600 Update CHANGELOG.md 2014-05-07 09:41:54 -07:00
Mitchell Hashimoto 62986e1324 Merge pull request #3670 from p0deje/public_send
core: public_send vs send when merging configs
2014-05-07 09:40:53 -07:00
Mitchell Hashimoto 7a1dc1e527 Merge pull request #3673 from mitchellh/rename-docker-provider-specs
providers/docker: Rename test files for consistency
2014-05-07 09:30:40 -07:00
Fabio Rehm 7538d07233 providers/docker: Ensure long flags are used 2014-05-07 12:12:16 -03:00
Fabio Rehm 3ab5064e02 providers/docker: Add required configs and specs (build is green now) 2014-05-07 12:12:16 -03:00
Fabio Rehm b68cb6d7b4 providers/docker: Container links are an array, not a hash 2014-05-07 12:12:16 -03:00
Fabio Rehm 89db0f64e5 providers/docker: Rename test files for consistency 2014-05-07 11:19:36 -03:00
Alex Rodionov 34ec385c81 core: public_send vs send when merging configs
This fixes the problem when config keys collide with Kernel/Object
methods (private). An example is `exec` which is used in vagrant-exec
plugin.

Compare:

> old.send :exec
ArgumentError: wrong number of arguments (0 for 1+)
> old.public_send :exec
=> #<Vagrant::Config::V2::DummyConfig:0x007fe212cc05c8>
2014-05-07 19:02:21 +07:00
Mitchell Hashimoto ca428388d8 providers/docker: can set default provider to docker [GH-3662] 2014-05-06 21:49:49 -07:00
Mitchell Hashimoto 8bb9d18260 guests/windows: nicer error if winrm not in use to configure networks [GH-3651] 2014-05-06 19:00:58 -07:00
Mitchell Hashimoto 326e8012f7 guests/*: setup rsync_pre properly 2014-05-06 18:40:55 -07:00
Mitchell Hashimoto 25589e509e commands/reload: if --provision is present, force provision [GH-3657] 2014-05-06 16:27:58 -07:00
Mitchell Hashimoto 4af97adb7c Update CHANGELOG.md 2014-05-06 14:47:54 -07:00
Mitchell Hashimoto 011005b5a0 Merge pull request #3654 from mithaler/patch-1
providers/docker: fix Docker error reporting bug
2014-05-06 14:47:03 -07:00
Michael Louis Thaler 9dcc53673a Fix error reporting bug
There's no "command" variable; it should be "cmd". This bug causes it to print an unhelpful exception if the Docker command fails.
2014-05-06 17:46:09 -04:00
Mitchell Hashimoto 48f5b0d53b providers/virtualbox: package --base should use vboxsf 2014-05-06 13:48:32 -07:00
Mitchell Hashimoto 4ef237a642 synced_folders/rsync: mkdir before rsync 2014-05-06 13:41:37 -07:00
Mitchell Hashimoto d4087db7c5 core: no active machines if there is no vagrant env 2014-05-06 13:36:42 -07:00
Mitchell Hashimoto 16a329214c Update CHANGELOG 2014-05-06 13:29:21 -07:00
Mitchell Hashimoto e7a5dc4f8e Revert "Merge pull request #3643 from cammoraton/rhel7-plugin-fixes"
This reverts commit 919d0b9f4b, reversing
changes made to 924c47feb3.
2014-05-06 13:26:44 -07:00
Mitchell Hashimoto 7e6ba7fa50 providers/virtualbox: check for provider config nilness 2014-05-06 13:10:22 -07:00
Mitchell Hashimoto 9a146d779c Update CHANGELOG 2014-05-06 12:51:02 -07:00
Mitchell Hashimoto 9d2d4b9675 guests/mint: don't need to inherit from ubuntu class 2014-05-06 12:50:35 -07:00
Mitchell Hashimoto 9e5fffb7f1 Merge pull request #3648 from chrisvire/fix/master/add_mint_guest
Add Linux Mint detection
2014-05-06 12:49:53 -07:00
Mitchell Hashimoto 0f350370e3 Up version for dev 2014-05-06 12:46:26 -07:00
Chris Hubbard fd86f5a57e Add Linux Mint detection
* Linux Mint is a popular distribution based on Ubuntu
* When creating a VM based on Linux Mint, it cannot detect
that it is based on Ubuntu and it is detected as just linux
and configure_networks fails
* https://github.com/mitchellh/vagrant/issues/3647
2014-05-06 15:09:33 -04:00
Mitchell Hashimoto 7a2f4c2168 website/www: 1.6 post 2014-05-06 09:22:02 -07:00
Mitchell Hashimoto e32adc3ee4 v1.6.0 2014-05-06 08:51:11 -07:00
Mitchell Hashimoto 5029966d3f Update CHANGELOG 2014-05-06 08:48:22 -07:00
Mitchell Hashimoto 771f951096 Merge pull request #3638 from jtopper/nfs-sudo-improvements
Improve use of sudo for NFS export manipulation
2014-05-06 08:47:50 -07:00
Mitchell Hashimoto 62bfefd96f website/docs: update docs for NFS sudoers 2014-05-06 08:47:11 -07:00
Mitchell Hashimoto 376b20d868 Update CHANGELOG.md 2014-05-06 08:43:59 -07:00
Mitchell Hashimoto 919d0b9f4b Merge pull request #3643 from cammoraton/rhel7-plugin-fixes
Rhel7 guest plugin fixes
2014-05-06 08:42:24 -07:00
Mitchell Hashimoto 924c47feb3 Merge pull request #3642 from jyggen/patch-2
guests/linux: Don't wrap the SMB password in single quotes.
2014-05-06 08:33:56 -07:00
Jonas Stendahl 8b5869fdc5 Don't wrap the escaped password in single quotes. 2014-05-06 15:47:44 +02:00
Teemu Matilainen 537eb3da6e Merge pull request #3640 from felixrabe/patch-1
Fix typo
2014-05-06 10:08:29 -03:00
Felix Rabe 7ff3a4b428 Fix typo 2014-05-06 14:57:23 +02:00
cammoraton 6d6282f1be Finished up fixes. Removed some artifacts. 2014-05-06 08:48:01 -04:00
cammoraton 5345c1479a Fix configure networks and templates to work off polled interface names. 2014-05-06 08:44:36 -04:00
cammoraton 6ff81dc29c Add interfaces_list capability to get list of interfaces via biosdevname
or dmesg parsing.
2014-05-06 08:44:15 -04:00
Jon Topper d85fa99ffb Added example sudoers config to contrib 2014-05-06 12:43:50 +01:00
Jon Topper 6ec9e3e279 Linux stuff now tested and working! 2014-05-06 12:24:35 +01:00
Jon Topper 4a4ca74dea Added missing 'sudo' call. 2014-05-06 10:05:53 +01:00
Mitchell Hashimoto 337e51c2a6 providers/docker: don't reload if not created 2014-05-05 22:06:22 -07:00
Mitchell Hashimoto 38d1f0c0aa providers/docker: smarter destroy, does not require host machine 2014-05-05 22:02:13 -07:00
Mitchell Hashimoto a34ee404d8 providers/*: use special NOT_CREATED_ID if not created 2014-05-05 21:52:28 -07:00
Mitchell Hashimoto 45fc89877c core: MachineIndex valid test is better 2014-05-05 21:50:51 -07:00
Mitchell Hashimoto 5d94ab9e60 core: if state ID is NOT_CREATED_ID, destroy machine state 2014-05-05 21:44:34 -07:00
Mitchell Hashimoto ff2f035f27 providers/docker: less hack way to clear ID if not created 2014-05-05 21:37:02 -07:00
Mitchell Hashimoto b26ecb0150 providers/docker: smarter about setting ID to nil for machine 2014-05-05 21:35:08 -07:00