openstack
/
heat
Code Issues Proposed changes

Merge branch 'puppet_instances' of github.com:heat-api/heat into puppet_instances 

Conflicts:
	heat/api/v1/__init__.py
This commit is contained in:
Chris Alfonso 2012-05-21 15:33:08 -04:00
parent 7d0a35030a 480d38266b
commit 2f827bdd2a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat/api/v1/__init__.py
View File

@ -78,7 +78,7 @@ class API(wsgi.Router):
mapper.connect("/", controller=stacks_resource,
action="validate_template",
conditions=dict(function=self.action('ValidateTemplate')
))
))
mapper.connect("/", controller=stacks_resource, action="index")