summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJake Dahn <jake@markupisart.com>2011-08-16 09:15:01 -0700
committerJake Dahn <jake@markupisart.com>2011-08-16 09:15:01 -0700
commitb6c8985cb10b40572d23b7971aac6d0577ebfe82 (patch)
tree08ac2ea9f8faa0c1ff4bd15012fd5e3bfaf77005
parent6220c4276e30c633ffc4165ce6db0d120c0e88a7 (diff)
another trunk merge
-rw-r--r--nova/tests/api/openstack/contrib/test_quotas.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/tests/api/openstack/contrib/test_quotas.py b/nova/tests/api/openstack/contrib/test_quotas.py
index 6ab2faf4d..6a7a1d9fa 100644
--- a/nova/tests/api/openstack/contrib/test_quotas.py
+++ b/nova/tests/api/openstack/contrib/test_quotas.py
@@ -151,7 +151,7 @@ class QuotasTest(test.TestCase):
req.body = json.dumps(updated_quota_set)
req.headers['Content-Type'] = 'application/json'
- res = req.get_response(fakes.wsgi_app(fake_auth_context=\
+ res = req.get_response(fakes.wsgi_app(fake_auth_context=
context.RequestContext('fake', 'fake',
is_admin=True)))