From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 31 Aug 2012 16:12:07 +0000 (+0000)
Subject: Merge "Implement volume quota support in Cinder"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=48ce2b79a1d393de14c825e5722b5a7710eb36aa;p=openstack-build%2Fcinder-build.git

Merge "Implement volume quota support in Cinder"
---

48ce2b79a1d393de14c825e5722b5a7710eb36aa
diff --cc cinder/tests/test_volume.py
index 0b12c0bdc,f5f4865a9..896a4e025
--- a/cinder/tests/test_volume.py
+++ b/cinder/tests/test_volume.py
@@@ -38,8 -38,9 +38,9 @@@ from cinder.openstack.common import rp
  import cinder.policy
  from cinder import quota
  from cinder import test
 -import cinder.volume.api
 +from cinder.volume import iscsi
  
+ QUOTAS = quota.QUOTAS
  FLAGS = flags.FLAGS