Mitchell Hashimoto 65ef8d2477 Merge branch 'nfs-per-user' of https://github.com/davedevelopment/vagrant into davedevelopment-nfs-per-user ... Conflicts: plugins/hosts/arch/host.rb plugins/hosts/bsd/host.rb plugins/hosts/linux/host.rb templates/nfs/exports.erb templates/nfs/exports_freebsd.erb templates/nfs/exports_linux.erb		2013-09-01 11:44:00 -07:00
..
commands	Simplify understanding of magic "2" in Vagrantfile [GH-1835]	2013-07-20 01:06:02 -04:00
config	Support warnings/errors when upgrading Vagrantfiles internally	2013-01-20 22:04:50 -05:00
guests	more capabilities for OpenBSD guest	2013-08-28 13:12:09 +09:00
locales	hosts/bsd: nice error if can't read exports file [GH-2038]	2013-09-01 10:25:00 -07:00
nfs	Merge branch 'nfs-per-user' of https://github.com/davedevelopment/vagrant into davedevelopment-nfs-per-user	2013-09-01 11:44:00 -07:00
provisioners	Merge branch 'chef_solo_environment_support' of https://github.com/marcparadise/vagrant into marcparadise-chef_solo_environment_support	2013-08-28 16:49:19 -07:00
package_Vagrantfile.erb	New `vagrant package` option `--vagrantfile` and changed semantics of `--include` (see CHANGELOG)	2010-09-12 23:20:13 -06:00
rgloader.rb	Extra protection in the rgloader file	2013-01-31 19:54:50 -08:00