review.fuel-infra Code Review - openstack-build/heat-build.git/commit

]> review.fuel-infra Code Review - openstack-build/heat-build.git/commit

author	Chris Alfonso <calfonso@redhat.com>
	Mon, 21 May 2012 19:33:08 +0000 (15:33 -0400)
committer	Chris Alfonso <calfonso@redhat.com>
	Mon, 21 May 2012 19:33:08 +0000 (15:33 -0400)
commit	2f827bdd2a5e6b12ee05a334096ebab1ede9580a
tree	68d0120c72af48c39566563eade4c185d28b8e76	tree \| snapshot
parent	7d0a35030ae50d9405368d36519db712896841cd	commit \| diff
parent	480d38266bc313197aa664c5c20f2a3b4f6d893b	commit \| diff

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

Conflicts:
heat/api/v1/__init__.py