diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-02 15:24:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-02 15:24:14 +0000 |
| commit | 1d943e7d61fa46c8ca813d1a581f6a5d66e99f12 (patch) | |
| tree | bea1763594510e09883d28a607daa937379cb18d /nova/api | |
| parent | 041e8ccd74bf7537163abf2de51a5ce68dab3a4d (diff) | |
| parent | 0f3fb0a1ba14072863d7b725d0b1a89d9566ac5a (diff) | |
Merge "Switch to using memorycache from oslo."
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/__init__.py | 2 | ||||
| -rw-r--r-- | nova/api/metadata/handler.py | 2 | ||||
| -rw-r--r-- | nova/api/openstack/compute/contrib/extended_availability_zone.py | 2 |
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 |