← Back to branch summary

~ubuntu-branches/ubuntu/quantal/nova/quantal-proposed

« back to all changes in this revision

Viewing changes to nova/api/ec2/__init__.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2011-12-09 14:24:07 UTC
  • mto: This revision was merged to the branch mainline in revision 55.
  • Revision ID: package-import@ubuntu.com-20111209142407-fviz6p5dnictpxsr
Tags: upstream-2012.1~e2~20111208.11721
Import upstream version 2012.1~e2~20111208.11721

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/api/ec2/__init__.py
120
120
        if FLAGS.memcached_servers:
121
121
            import memcache
122
122
        else:
123
 
            from nova import fakememcache as memcache
 
123
            from nova.testing.fake import memcache
124
124
        self.mc = memcache.Client(FLAGS.memcached_servers,
125
125
                                  debug=0)
126
126
        super(Lockout, self).__init__(application)