From: Ian Main <imain@redhat.com>
Date: Tue, 27 Mar 2012 18:56:30 +0000 (-0700)
Subject: Fix up some imports so they work.  I think this is right now. :)
X-Git-Tag: 2014.1~2088^2~11
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8b005f95143a6a2ff51f7a6fb6110ed9a0ead487;p=openstack-build%2Fheat-build.git

Fix up some imports so they work.  I think this is right now. :)

Signed-off-by: Ian Main <imain@redhat.com>
---

diff --git a/heat/engine/manager.py b/heat/engine/manager.py
index 1c3887d0..a4545345 100644
--- a/heat/engine/manager.py
+++ b/heat/engine/manager.py
@@ -46,7 +46,7 @@ import logging
 from eventlet import greenthread
 
 import heat.context
-from heat import exception
+from heat.common import exception
 from heat import manager
 from heat.openstack.common import cfg
 from heat import rpc
diff --git a/heat/service.py b/heat/service.py
index 5f0cfbd4..bf4340f5 100644
--- a/heat/service.py
+++ b/heat/service.py
@@ -30,9 +30,9 @@ from heat.openstack.common import cfg
 
 from heat.common import utils
 from heat.common import config
+from heat.common import exception
 
 from heat import context
-from heat import exception
 from heat import rpc
 from heat import version