Mitchell Hashimoto 802168f4b5 Merge branch 'add-chef-environment' of github.com:cfortier2/packer into cfortier2-add-chef-environment ... Conflicts: provisioner/chef-client/provisioner.go		2014-09-05 16:13:32 -07:00
..
provisioner.go	Merge branch 'add-chef-environment' of github.com:cfortier2/packer into cfortier2-add-chef-environment	2014-09-05 16:13:32 -07:00
provisioner_test.go	add chef_environment test	2014-05-21 09:30:18 -04:00