Mitchell Hashimoto 825864a9ea Merge branch 'additional-user-variables' of github.com:nBerg/packer into nBerg-additional-user-variables ... Conflicts: builder/amazon/common/run_config.go		2014-09-02 09:57:52 -07:00
..
provisioner.go	Merge branch 'additional-user-variables' of github.com:nBerg/packer into nBerg-additional-user-variables	2014-09-02 09:57:52 -07:00
provisioner_test.go	provisioner/chef-client: docs and validation key path	2014-02-24 09:45:04 -08:00