From: Angus Salkeld Date: Tue, 24 Apr 2012 00:34:38 +0000 (+1000) Subject: Merge remote-tracking branch 'origin/master' into ha X-Git-Tag: 2014.1~1923^2~17 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6bf132f9098a24102e73851f4c7e08acea3493fa;p=openstack-build%2Fheat-build.git Merge remote-tracking branch 'origin/master' into ha --- 6bf132f9098a24102e73851f4c7e08acea3493fa