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
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
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
0a43cf2b6f
core: fix exception when checksum type is nil
...
Thanks @johnbellone
2013-12-03 18:52:44 -08:00
e83070371d
kernel/v2: fix validation on checksum types
2013-12-03 18:46:22 -08:00
832a5ef70b
providers/virtualbox: clean up synced folders on destroy
2013-12-03 18:44:37 -08:00
9a58917d3a
core: only set I18n setting on newer versions
...
/cc @fgrehm - Looks like only the later versions have this.
2013-12-03 18:43:19 -08:00
1a51f42ee7
core: update rspec, fix deprecations
2013-12-03 18:42:21 -08:00
ae4fa1a946
core: better synced folder plugin docs
2013-12-03 18:33:24 -08:00
c04fa5e54e
core: clean up tests for synced folder built-ins
2013-12-03 18:30:59 -08:00
ca521887eb
Merge pull request #2561 from emyl/synced-folder-cleanup-v2
...
core: Enhance the synced folder plugin implementation with a cleanup routine
2013-12-03 18:08:42 -08:00
42fd5f1db0
Merge pull request #2575 from fgrehm/remove-18n-deprecation-warning
...
Set I18n.config.enforce_available_locales to true to avoid an annoying deprecation warning
2013-12-03 17:54:08 -08:00
44d2f5e660
Update CHANGELOG
2013-12-03 17:51:55 -08:00
146bc34019
Merge pull request #2549 from mitchellh/f-docker-provisioner
...
docker provisioner
2013-12-03 17:47:42 -08:00
76fd0e7efd
website/docs: document the Docker provisioner
2013-12-03 16:29:06 -08:00
8f4fa897d0
provisioners/docker: use proper UNSET_VALUE for no value
2013-12-03 16:19:08 -08:00
954641d801
core: Set I18n.config.enforce_available_locales to true to avoid an annoying deprecation warning
2013-12-03 21:20:37 -02:00
999ce22354
provisioners/docker: output version when installing
2013-12-03 14:39:32 -08:00
f7916c0cff
provisioners/docker: output for each image pulling
2013-12-03 14:38:38 -08:00
ecbd0bfa85
provisioners/docker: style nitpicks
2013-12-03 14:36:14 -08:00
8d6cac959f
provisioners/docker: only allow 'args' special
2013-12-03 14:35:56 -08:00
33d3c28086
provisioners/docker: simplify run, output which are running
2013-12-03 14:33:13 -08:00
c55f7dfd64
provisioners/docker: allow images to be configured with images:
2013-12-03 14:25:20 -08:00
d3b7bffc65
provisioners/docker: style nitpick on unless
2013-12-03 14:19:31 -08:00
dda7cbb412
provisioners/docker: make sure version is correct type, fix Ruby warning
2013-12-03 14:18:30 -08:00
5ee3a06740
provisioners/chef: fix validate return so that it is properly formatted
2013-12-03 13:59:59 -08:00
61b622994e
Update CHANGELOG
2013-12-03 12:15:57 -08:00
d9dc2d6cfd
guests/linux: --no-wait on emit [GH-2564]
2013-12-03 12:14:10 -08:00
Mitchell Hashimoto
John Bellone
Fabio Rehm
Benny Lichtner
Teemu Matilainen
Paul Hinze
Emiliano Ticci