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
..
chroot	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
common	builder/amazon: support auto spot price discovery [GH-1465]	2014-09-06 10:44:12 -07:00
ebs	builder/amazon-ebs: don't clean up AMI if doesn't exist [GH-1469]	2014-09-08 09:53:20 -07:00
instance	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