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

..

config

Add nfs mount option to puppet provisioner

2013-06-24 19:52:33 +02:00

provisioner

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

plugin.rb

Puppet uses the new provisioner API

2013-01-13 16:22:47 -08:00