From: Chris Alfonso <calfonso@redhat.com>
Date: Mon, 23 Apr 2012 13:26:57 +0000 (-0400)
Subject: Merge branch 'resource_unit_tests'
X-Git-Tag: 2014.1~1938
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=bf859e6f4b69d35dbf496522d1e75e4cc3771507;p=openstack-build%2Fheat-build.git

Merge branch 'resource_unit_tests'
---

bf859e6f4b69d35dbf496522d1e75e4cc3771507