summaryrefslogtreecommitdiffstats
path: root/nova/image
diff options
context:
space:
mode:
authorAndrew Bogott <abogott@wikimedia.org>2012-06-28 15:59:23 -0500
committerAndrew Bogott <abogott@wikimedia.org>2012-07-02 15:57:09 -0500
commitd335457f48d09c3d780c92413fe777030c1335e2 (patch)
tree3403e3548f1a374b002470f8c7c399a9e8eed381 /nova/image
parent2038e933bd8bde659e31b4a78e2211a585e3dcec (diff)
downloadnova-d335457f48d09c3d780c92413fe777030c1335e2.tar.gz
nova-d335457f48d09c3d780c92413fe777030c1335e2.tar.xz
nova-d335457f48d09c3d780c92413fe777030c1335e2.zip
Switch to common logging.
I only just moved logging from nova to common, so behavior should remain the same. Change-Id: I1d7304ca200f9d024bb7244d25be2f9a670318fb
Diffstat (limited to 'nova/image')
-rw-r--r--nova/image/glance.py2
-rw-r--r--nova/image/s3.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/image/glance.py b/nova/image/glance.py
index d8c2e1245..2da91c9b6 100644
--- a/nova/image/glance.py
+++ b/nova/image/glance.py
@@ -30,8 +30,8 @@ from glance.common import exception as glance_exception
from nova import exception
from nova import flags
-from nova import log as logging
from nova.openstack.common import jsonutils
+from nova.openstack.common import log as logging
from nova.openstack.common import timeutils
from nova import utils
diff --git a/nova/image/s3.py b/nova/image/s3.py
index df2758b3a..282f7702a 100644
--- a/nova/image/s3.py
+++ b/nova/image/s3.py
@@ -34,8 +34,8 @@ import nova.cert.rpcapi
from nova import exception
from nova import flags
from nova.image import glance
-from nova import log as logging
from nova.openstack.common import cfg
+from nova.openstack.common import log as logging
from nova import utils