Anders Ingemann f50a8e66ce Merge branch 'master' into development ... Conflicts: .gitignore bootstrapvz/common/tasks/apt.py bootstrapvz/plugins/cloud_init/__init__.py bootstrapvz/plugins/cloud_init/tasks.py tox.ini		2014-05-08 23:00:54 +02:00
..
assets	Move code into proper package folder	2014-04-02 21:26:13 +02:00
tasks	Merge branch 'master' into development	2014-05-08 23:00:54 +02:00
__init__.py	HVM AMIs only work when EBS backed right now.	2014-05-04 13:46:40 +02:00
ebsvolume.py	Set volume dev_path to None when detaching	2014-04-07 21:52:20 +02:00
manifest-schema-s3.json	Fix #21, check the AWS user-id on S3 manifests	2014-05-04 14:02:38 +02:00
manifest-schema.json	HVM AMIs only work when EBS backed right now.	2014-05-04 13:46:40 +02:00