Mitchell Hashimoto 3a69b8c1b8 Merge branch 'add-spot-instance-support' of github.com:henrysher/packer into henrysher-add-spot-instance-support ...

Conflicts:
	builder/amazon/common/run_config.go
	builder/amazon/ebs/builder.go
	builder/amazon/instance/builder.go

2014-09-05 16:30:22 -07:00

..

chroot

builder/amazon-chroot: add description with time created snapshot

2014-09-05 16:10:33 -07:00

common

Merge branch 'add-spot-instance-support' of github.com:henrysher/packer into henrysher-add-spot-instance-support

2014-09-05 16:30:22 -07:00

ebs

Merge branch 'add-spot-instance-support' of github.com:henrysher/packer into henrysher-add-spot-instance-support

2014-09-05 16:30:22 -07:00

instance

Merge branch 'add-spot-instance-support' of github.com:henrysher/packer into henrysher-add-spot-instance-support

2014-09-05 16:30:22 -07:00