]> review.fuel-infra Code Review - openstack-build/heat-build.git/commit
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)
commitf489c956c67240cfa3f3d5b8a4b54c9e7d4531e7
tree8601e78f8d9a5c4a8d2828de88555e681184774a
parent10295665615ae525caa06c42a3edf3b81db817b8
parentfe8a57c9cfd0e29aae5bd1f913370434953a5d69
Merge branch 'ha'

Conflicts:
heat/db/sqlalchemy/session.py

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