From: Angus Salkeld <asalkeld@redhat.com>
Date: Thu, 26 Apr 2012 14:22:24 +0000 (+1000)
Subject: Merge branch 'ha'
X-Git-Tag: 2014.1~1923
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=f489c956c67240cfa3f3d5b8a4b54c9e7d4531e7;p=openstack-build%2Fheat-build.git

Merge branch 'ha'

Conflicts:
	heat/db/sqlalchemy/session.py

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

f489c956c67240cfa3f3d5b8a4b54c9e7d4531e7