]> review.fuel-infra Code Review - openstack-build/heat-build.git/commit
Merge branch 'puppet_instances'
authorChris Alfonso <calfonso@redhat.com>
Mon, 21 May 2012 19:39:11 +0000 (15:39 -0400)
committerChris Alfonso <calfonso@redhat.com>
Mon, 21 May 2012 19:39:11 +0000 (15:39 -0400)
commitaf8dab457046b5911ad22d8442dfd153408ebfc5
treeb44a67e9f929ead9c3d0d006542b4a868fa40fb5
parenta72267cb0cab2e61e49b6f53e40aadbca3e8ec91
parent2f827bdd2a5e6b12ee05a334096ebab1ede9580a
Merge branch 'puppet_instances'

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