From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 18 Jul 2013 01:06:15 +0000 (+0000)
Subject: Merge "Update oslo.notifier and always register options"
X-Git-Tag: 2014.1~355
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3e4e007685177d803d5eb56bb321f5fe74516fe1;p=openstack-build%2Fheat-build.git

Merge "Update oslo.notifier and always register options"
---

3e4e007685177d803d5eb56bb321f5fe74516fe1
diff --cc heat/tests/test_engine_service.py
index f7556b10,9e5b3cb9..652daf1a
--- a/heat/tests/test_engine_service.py
+++ b/heat/tests/test_engine_service.py
@@@ -18,11 -18,8 +18,10 @@@ import jso
  import sys
  
  import mox
 +from testtools import matchers
 +
  from oslo.config import cfg
  
- from heat.common import config
  from heat.common import context
  from heat.engine import environment
  from heat.common import exception