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
..
__init__.py	Merge branch 'puppet_instances' of github.com:heat-api/heat into puppet_instances	2012-05-21 15:33:08 -04:00
stacks.py	ValidateTemplate API call framework	2012-05-04 10:16:52 -07:00