summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/ec2/__init__.py2
-rw-r--r--nova/api/metadata/handler.py2
-rw-r--r--nova/api/openstack/compute/contrib/extended_availability_zone.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py
index 397190fae..e094cf0b3 100644
--- a/nova/api/ec2/__init__.py
+++ b/nova/api/ec2/__init__.py
@@ -32,12 +32,12 @@ from nova.api.ec2 import apirequest
from nova.api.ec2 import ec2utils
from nova.api.ec2 import faults
from nova.api import validator
-from nova.common import memorycache
from nova import context
from nova import exception
from nova.openstack.common import importutils
from nova.openstack.common import jsonutils
from nova.openstack.common import log as logging
+from nova.openstack.common import memorycache
from nova.openstack.common import timeutils
from nova import utils
from nova import wsgi
diff --git a/nova/api/metadata/handler.py b/nova/api/metadata/handler.py
index 7cccbc324..bbaeba524 100644
--- a/nova/api/metadata/handler.py
+++ b/nova/api/metadata/handler.py
@@ -26,10 +26,10 @@ import webob.dec
import webob.exc
from nova.api.metadata import base
-from nova.common import memorycache
from nova import conductor
from nova import exception
from nova.openstack.common import log as logging
+from nova.openstack.common import memorycache
from nova import wsgi
CACHE_EXPIRATION = 15 # in seconds
diff --git a/nova/api/openstack/compute/contrib/extended_availability_zone.py b/nova/api/openstack/compute/contrib/extended_availability_zone.py
index 734ddf7c8..af557219f 100644
--- a/nova/api/openstack/compute/contrib/extended_availability_zone.py
+++ b/nova/api/openstack/compute/contrib/extended_availability_zone.py
@@ -21,8 +21,8 @@ from nova.api.openstack import extensions
from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil
from nova import availability_zones
-from nova.common import memorycache
from nova.openstack.common import log as logging
+from nova.openstack.common import memorycache
LOG = logging.getLogger(__name__)
# NOTE(vish): azs don't change that often, so cache them for an hour to