Mitchell Hashimoto 349b2507f9 Merge branch 'unpriv_shell' of https://github.com/frsantos/vagrant into frsantos-unpriv_shell ...

Conflicts:
	plugins/provisioners/shell/config.rb
	plugins/provisioners/shell/provisioner.rb

2013-08-28 22:29:49 -07:00

..

ansible

plugins/provisioners: put generated inventory file in vagrantfile dir

2013-08-28 16:54:44 -07:00

cfengine

Don't forcibly output newlines for provisioners

2013-07-19 23:38:25 -04:00

chef

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

puppet

Update CHANGELOG

2013-08-09 11:53:58 -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