Commit Graph

6300 Commits

Author SHA1 Message Date
Mitchell Hashimoto a9029842a6 kernel/v2: multiple synced folder lines override each other 2014-05-08 18:39:13 -07:00
Mitchell Hashimoto 92940a7c5d synced_folders/nfs: allow disabling export [GH-3636] 2014-05-08 17:10:38 -07:00
Mitchell Hashimoto 434a13b4e4 kernel/v2: automatically forward winrm if comm is winrm [GH-3685] 2014-05-08 17:00:55 -07:00
Fabio Rehm 1eec62cb9e provisioners/shell: Fix shell provisioning when config.binary is set to false [GH-3712]
The `config` in use was the Shell provisioner config that does not expose
access to the VM configs.

References https://github.com/fgrehm/vagrant-lxc/issues/284
2014-05-08 18:55:07 -03:00
Mitchell Hashimoto 1ae99e3a2e kernel/v2: convert network type to symbol earlier 2014-05-08 13:38:40 -07:00
Mitchell Hashimoto aee71a093b providers/docker: forward ports properly 2014-05-08 13:37:55 -07:00
Mitchell Hashimoto 471b3b4059 website/docs: document SSL share [GH-3672] 2014-05-08 13:25:39 -07:00
Mitchell Hashimoto a5ca5b39ab website/docs: make mention of docker provider on provisioner page 2014-05-08 13:15:13 -07:00
Fabio Rehm 8fab12cd2a Update CHANGELOG.md 2014-05-08 15:50:37 -03:00
Fabio Rehm 66d9f06311 Merge pull request #3719 from goshakkk/docker-run-links-fix
Fix docker container linking
2014-05-08 15:48:29 -03:00
Gosha Arinich 7558524482 docker container links is actually a hash, fix tests 2014-05-08 21:27:58 +03:00
Gosha Arinich faba9bdae9 Revert "providers/docker: Container links are an array, not a hash"
This reverts commit b68cb6d7b4.
2014-05-08 21:10:37 +03:00
Mitchell Hashimoto 9a8a0499c7 providers/docker: don't use HGFS on VMware fusion [GH-3687] 2014-05-08 10:06:06 -07:00
Mitchell Hashimoto 4e52facebc core: properly yield in locker 2014-05-08 09:57:52 -07:00
Mitchell Hashimoto 86aef2249b core: don't lock machines on SSH access 2014-05-08 09:55:23 -07:00
Mitchell Hashimoto c724130a4d Merge pull request #3717 from berendt/change_name_of_downloads
website/www: changed titles of package downloads
2014-05-08 09:28:03 -07:00
Christian Berendt 5659ffc239 changed titles of package downloads
Like discussed in #3704.
2014-05-08 18:24:20 +02:00
Mitchell Hashimoto 338328fa15 kernel/v2: hostnames can be one character [GH-3713] 2014-05-08 09:10:13 -07:00
Mitchell Hashimoto ef132cb84f Merge pull request #3714 from szuliq/patch-1
website/docs: Amend default manifest name for puppet apply
2014-05-08 09:07:36 -07:00
Krzysztof Szularz fd8f1ed0cc Amend default manifest name for puppet apply
Option listing still quoted `init.pp` as default manifest name.
2014-05-08 16:07:50 +02:00
Mitchell Hashimoto e308250689 website/www: version.txt 2014-05-07 23:14:11 -07:00
Gilles Cornu 919b5245ff provisioners/chef: Rename a unit test file
This way these tests are part of `rake test:unit`

Similar to [GH-3673]
2014-05-08 06:00:58 +02:00
Mitchell Hashimoto 8cc7b1030b website/docs: document docker build_args 2014-05-07 18:42:13 -07:00
Mitchell Hashimoto 030c1ee481 providers/docker: build_args [GH-3684] 2014-05-07 18:41:24 -07:00
Mitchell Hashimoto 446dd51af2 website/docs: document RDP raw args 2014-05-07 18:34:22 -07:00
Mitchell Hashimoto e1815a13e8 commands/rdp: support extra args to RDP client [GH-3686] 2014-05-07 18:32:20 -07:00
Mitchell Hashimoto 9e09616d91 Up version 2014-05-07 17:28:25 -07:00
Mitchell Hashimoto d1a26bf8ca core: add more logging to check box outdated 2014-05-07 17:21:17 -07:00
Mitchell Hashimoto f309ed3103 v1.6.1 2014-05-07 15:34:44 -07:00
Mitchell Hashimoto b2f9e86135 providers/docker: make sure command isn't scoped 2014-05-07 15:12:30 -07:00
Mitchell Hashimoto 61caaa00c6 commands/docker-run: --help works [GH-3698] 2014-05-07 15:11:57 -07:00
Mitchell Hashimoto a00d2481f5 providers/docker: put sync folders in var lib docker [GH-3680] 2014-05-07 15:09:53 -07:00
Mitchell Hashimoto cc75eb188f providers/docker: support custom shell properly [GH-3697] 2014-05-07 15:00:51 -07:00
Mitchell Hashimoto b47df84887 communicators/winrm: fix tests 2014-05-07 10:09:14 -07:00
Mitchell Hashimoto 882c9ad7f6 communicators/winrm: good_exit option 2014-05-07 09:47:47 -07:00
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