]> review.fuel-infra Code Review - openstack-build/heat-build.git/commitdiff
Code Review / openstack-build / heat-build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: a72267c 2f827bd)
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)
Conflicts:
heat/api/v1/__init__.py
heat/engine/parser.py

1  2 
heat/engine/instance.py patch | diff1 | diff2 | blob | history
heat/engine/parser.py patch | diff1 | diff2 | blob | history

diff --cc heat/engine/instance.py
Simple merge
diff --cc heat/engine/parser.py
Simple merge