Mitchell Hashimoto 93c98aad01 Merge branch 'pr/1267' ...

Conflicts:
	plugins/provisioners/chef/provisioner/chef_client.rb

2013-08-29 10:50:50 -07:00

..

base.rb

Adds formatter option to Chef Provisioner [GH-1250]

2013-07-18 00:45:31 -04:00

chef_client.rb

Merge branch 'pr/1267'

2013-08-29 10:50:50 -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