]> 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: 1029566 fe8a57c)
Merge branch 'ha'
authorAngus Salkeld <asalkeld@redhat.com>
Thu, 26 Apr 2012 14:22:24 +0000 (00:22 +1000)
committerAngus Salkeld <asalkeld@redhat.com>
Thu, 26 Apr 2012 14:22:24 +0000 (00:22 +1000)
Conflicts:
heat/db/sqlalchemy/session.py

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

Trivial merge