Max Lincoln 583254b2b7 Merge branch 'master' of github.com:mitchellh/vagrant into winrm_error_handling ...

Conflicts:
	plugins/communicators/winrm/config.rb
	plugins/communicators/winrm/shell.rb
	test/unit/plugins/communicators/winrm/shell_test.rb

2015-02-16 10:30:12 -05:00

..

commands

Verify the token is valid when saving

2015-01-09 13:24:53 -05:00

communicators/winrm

Add retry_delay setting to speed up test

2015-01-28 13:41:07 -05:00

guests

Merge pull request #4209 from mwrock/smb_sync

2014-10-07 08:19:26 -07:00

kernel_v2/config

Merge branch 'master' into winrm_error_handling

2015-01-20 16:07:00 -05:00

providers

providers/virtualbox: read netmask from dhcpservers

2015-01-21 10:51:39 -08:00

provisioners

provisioners/ansible: increase connection timeout

2015-01-12 10:54:01 +01:00

pushes

Add tests for sending metadata

2015-02-04 11:45:02 -05:00

synced_folders

commands/rsync-auto: check machine ID prior to sync [GH-4031]

2014-08-06 16:56:09 -07:00