Max Lincoln c37c12526a Merge branch 'master' of github.com:mitchellh/vagrant into winrm_error_handling ... Conflicts: vagrant.gemspec		2015-01-28 10:44:47 -05:00
..
commands	Verify the token is valid when saving	2015-01-09 13:24:53 -05:00
communicators/winrm	Merge branch 'master' into winrm_error_handling	2015-01-20 16:07:00 -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	Fix failing push test	2015-01-05 10:56:11 -05:00
synced_folders	commands/rsync-auto: check machine ID prior to sync [GH-4031]	2014-08-06 16:56:09 -07:00