summaryrefslogtreecommitdiffstats
path: root/nova/image/s3.py
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2012-02-03 00:50:58 +0000
committerMark McLoughlin <markmc@redhat.com>2012-02-03 19:21:54 +0000
commit9871c5f963b6d98240635a9a447d14d46133c910 (patch)
treef58c68d5e2dbb98c494b142097832f3679d157ce /nova/image/s3.py
parent9dadca1f3a8fda00d93f429846dce6bd8ae534a2 (diff)
downloadnova-9871c5f963b6d98240635a9a447d14d46133c910.tar.gz
nova-9871c5f963b6d98240635a9a447d14d46133c910.tar.xz
nova-9871c5f963b6d98240635a9a447d14d46133c910.zip
Move cfg to nova.openstack.common
Move it here so that it can be kept in sync with openstack-common using the new update.py script for code in openstack-common's incubation area. See here for more details: http://wiki.openstack.org/CommonLibrary#Incubation Note: this commit just moves the existing code in Nova with no other changes. A subsequent commit will sync it with latest openstack-common so that it is easier see the new changes. Change-Id: If88d678b1b9bad3d37117de7f7159d7fea8ab4c8
Diffstat (limited to 'nova/image/s3.py')
-rw-r--r--nova/image/s3.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/image/s3.py b/nova/image/s3.py
index ee11c163c..2be1b5ede 100644
--- a/nova/image/s3.py
+++ b/nova/image/s3.py
@@ -31,11 +31,11 @@ import eventlet
from nova import rpc
import nova.db.api
-from nova.common import cfg
from nova import exception
from nova import flags
from nova import image
from nova import log as logging
+from nova.openstack.common import cfg
from nova import utils
from nova.api.ec2 import ec2utils