Max Lincoln d6e91483a6 Merge branch 'master' of github.com:mitchellh/vagrant into winrmssl ...

Conflicts:
	vagrant.gemspec

2015-02-09 11:10:23 -05:00

..

acceptance

providers/virtualbox: don't error when intnet set to "true" [GH-2751]

2014-01-03 08:31:14 -08:00

config

Add rake acceptance:boxes to download required boxes for tests

2011-11-13 13:37:30 -08:00

support

core: don't use Tempdir for tests, use Dir.mktmpdir

2014-01-15 10:48:19 -08:00

unit

Merge branch 'master' of github.com:mitchellh/vagrant into winrmssl

2015-02-09 11:10:23 -05:00