Chris Alfonso 2f827bdd2a Merge branch 'puppet_instances' of github.com:heat-api/heat into puppet_instances ... Conflicts: heat/api/v1/__init__.py		2012-05-21 15:33:08 -04:00
..
middleware	openstack-common: timeutils and importutils seperated out	2012-04-27 10:23:19 +10:00
v1	Merge branch 'puppet_instances' of github.com:heat-api/heat into puppet_instances	2012-05-21 15:33:08 -04:00
__init__.py	Remove openstack copy right assignment as we have not done that yet.	2012-03-15 09:36:51 +11:00
versions.py	Remerge common code with glance.	2012-03-16 14:14:25 +11:00