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

Browse Source

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 all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files