Mitchell Hashimoto 716d4719dc Merge pull request #1622 from delitescere/GH-1533-aws-timeout ... builder/amazon: Extend timeout and allow user override [GH-1533]		2014-10-28 08:15:18 -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	Merge pull request #1622 from delitescere/GH-1533-aws-timeout	2014-10-28 08:15:18 -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