]> review.fuel-infra Code Review - openstack-build/cinder-build.git/commitdiff
Code Review / openstack-build / cinder-build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: f5f1824 a3af3f8)
Merge "Implement volume quota support in Cinder"
authorJenkins <jenkins@review.openstack.org>
Fri, 31 Aug 2012 16:12:07 +0000 (16:12 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 31 Aug 2012 16:12:07 +0000 (16:12 +0000)
1  2 
cinder/exception.py patch | diff1 | diff2 | blob | history
cinder/tests/test_volume.py patch | diff1 | diff2 | blob | history

diff --cc cinder/exception.py
Simple merge
diff --cc cinder/tests/test_volume.py
index 0b12c0bdc091f407e7e7353c24717ec789ca2850,f5f4865a91ca6de043a02ae5a801e9b2f1103a92..896a4e0252d921a74d4ef9b02fde973dade01768
--- 1/cinder/tests/test_volume.py
--- 2/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