From: Chris Alfonso <calfonso@redhat.com>
Date: Mon, 21 May 2012 19:39:11 +0000 (-0400)
Subject: Merge branch 'puppet_instances'
X-Git-Tag: 2014.1~1809
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=af8dab457046b5911ad22d8442dfd153408ebfc5;p=openstack-build%2Fheat-build.git

Merge branch 'puppet_instances'

Conflicts:
	heat/api/v1/__init__.py
	heat/engine/parser.py
---

af8dab457046b5911ad22d8442dfd153408ebfc5