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
..
base.rb	Adds formatter option to Chef Provisioner [GH-1250]	2013-07-18 00:45:31 -04:00
chef_client.rb	Moves to using new chef cache/backup dir defaults.	2013-07-16 16:50:10 -07:00
chef_solo.rb	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