Mitchell Hashimoto 8f2f654446 Merge branch 'chef_solo_environment_support' of https://github.com/marcparadise/vagrant into marcparadise-chef_solo_environment_support ...

Conflicts:
	plugins/provisioners/chef/config/chef_solo.rb

2013-08-28 16:49:19 -07:00

..

ansible

provisioners/ansible: allow verbose :extra to be string

2013-08-28 16:46:04 -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

Don't forcibly output newlines for provisioners

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