Mitchell Hashimoto d7b398a905 Merge branch 'fix/master/puppet-provisioner-nfs-support' of https://github.com/mfournier/vagrant into mfournier-fix/master/puppet-provisioner-nfs-support ... Conflicts: CHANGELOG.md plugins/provisioners/puppet/provisioner/puppet.rb		2013-09-01 13:32:49 -07:00
..
ansible	provisioners/ansible: use proper config name [GH-2104]	2013-08-31 21:48:41 -07:00
cfengine	Don't forcibly output newlines for provisioners	2013-07-19 23:38:25 -04:00
chef	provisioners/chef: error if knife not found and auto-deleting	2013-08-29 11:36:37 -07:00
puppet	Merge branch 'fix/master/puppet-provisioner-nfs-support' of https://github.com/mfournier/vagrant into mfournier-fix/master/puppet-provisioner-nfs-support	2013-09-01 13:32:49 -07:00
salt	provisioners/salt: default bootstrap script gets latest	2013-08-29 17:40:59 -07:00
shell	Merge branch 'unpriv_shell' of https://github.com/frsantos/vagrant into frsantos-unpriv_shell	2013-08-28 22:29:49 -07:00