vagrant/plugins/provisioners/puppet/provisioner
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
..
puppet.rb 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
puppet_server.rb Use --color=false for Puppet no color [GH-2000] 2013-07-28 12:07:48 -07:00