From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 29 Apr 2013 11:59:25 +0000 (+0000)
Subject: Merge "Do not initialize anything during import phase"
X-Git-Tag: 2014.1~689
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=746877fe2ec4bb44edd88dd714eb6a20ef8162a2;p=openstack-build%2Fheat-build.git

Merge "Do not initialize anything during import phase"
---

746877fe2ec4bb44edd88dd714eb6a20ef8162a2
diff --cc heat/tests/test_rpc_client.py
index fe42a888,d250c2f7..7783d225
--- a/heat/tests/test_rpc_client.py
+++ b/heat/tests/test_rpc_client.py
@@@ -24,9 -24,9 +24,10 @@@ from oslo.config import cf
  import stubout
  import unittest
  
+ from heat.common import config
  from heat.common import context
  from heat.common import identifier
 +from heat.rpc import api as rpc_api
  from heat.rpc import client as rpc_client
  from heat.openstack.common import rpc