From: Jenkins <jenkins@review.stackforge.org>
Date: Thu, 28 Jun 2012 22:00:45 +0000 (+0000)
Subject: Merge changes I05dcfd9a,If938b51a,Iebd2693b
X-Git-Tag: 2014.1~1666
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=73492540ddd009b6a0a3ed3f855bde38b05e1b0d;p=openstack-build%2Fheat-build.git

Merge changes I05dcfd9a,If938b51a,Iebd2693b

* changes:
  Don't go fishing in the stack for the KeyName
  Tidy up create timeout code
  Get rid of _wrap_db_error()
---

73492540ddd009b6a0a3ed3f855bde38b05e1b0d