Mitchell Hashimoto 75395af12d Merge branch '1064-fix-upload-file-permissions' of github.com:rasa/packer into rasa-1064-fix-upload-file-permissions ... Conflicts: builder/parallels/common/step_upload_parallels_tools.go builder/vmware/common/step_upload_tools.go provisioner/chef-client/provisioner.go provisioner/chef-solo/provisioner.go		2014-09-08 13:20:46 -07:00
..
provisioner.go	Merge branch '1064-fix-upload-file-permissions' of github.com:rasa/packer into rasa-1064-fix-upload-file-permissions	2014-09-08 13:20:46 -07:00
provisioner_test.go	Add inventory_file option to Ansible provisioner.	2014-04-04 14:58:48 -05:00