Mitchell Hashimoto f63ef395f1 Merge branch 'rsync_install' of https://github.com/tmatilai/vagrant into tmatilai-rsync_install ... Conflicts: plugins/guests/freebsd/plugin.rb plugins/guests/netbsd/plugin.rb plugins/guests/openbsd/plugin.rb		2014-02-03 12:12:49 +01:00
..
acceptance	providers/virtualbox: don't error when intnet set to "true" [GH-2751]	2014-01-03 08:31:14 -08:00
acceptance_old	move test/acceptance to test/acceptance_old	2013-12-04 15:35:50 -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 'rsync_install' of https://github.com/tmatilai/vagrant into tmatilai-rsync_install	2014-02-03 12:12:49 +01:00