diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-12-07 18:13:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-12-07 18:13:48 +0000 |
| commit | 0b28e574afa8563524e21d31d95972c8ba126de2 (patch) | |
| tree | f093132f890b76bb500898f6a3d3102e849fe26d /nova/api | |
| parent | 0c78c2ed61c84ff967c2e6894f5dcff0987c2dec (diff) | |
| parent | f845891184b17e2c31a2b02dbc9217978abd3242 (diff) | |
| download | nova-0b28e574afa8563524e21d31d95972c8ba126de2.tar.gz nova-0b28e574afa8563524e21d31d95972c8ba126de2.tar.xz nova-0b28e574afa8563524e21d31d95972c8ba126de2.zip | |
Merge "First steps towards consolidating testing infrastructure"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py index 23042dab0..0433d5152 100644 --- a/nova/api/ec2/__init__.py +++ b/nova/api/ec2/__init__.py @@ -120,7 +120,7 @@ class Lockout(wsgi.Middleware): if FLAGS.memcached_servers: import memcache else: - from nova import fakememcache as memcache + from nova.testing.fake import memcache self.mc = memcache.Client(FLAGS.memcached_servers, debug=0) super(Lockout, self).__init__(application) |