]> review.fuel-infra Code Review - openstack-build/cinder-build.git/commitdiff
Merge "GET volumes API sorting enhancements common utilities"
authorJenkins <jenkins@review.openstack.org>
Sat, 28 Feb 2015 08:22:01 +0000 (08:22 +0000)
committerGerrit Code Review <review@openstack.org>
Sat, 28 Feb 2015 08:22:01 +0000 (08:22 +0000)
1  2 
cinder/db/sqlalchemy/api.py
cinder/tests/test_db_api.py

Simple merge
index c39b65ae76796eb7cf77e95ddec9426b3f93406f,e2d3f5f6443cb5a97a98df4288e23ede5bbe3edc..38425272ed630dae7ea6257d821a764b0565f0e2
@@@ -21,8 -21,9 +21,9 @@@ from oslo_utils import uuidutil
  
  from cinder import context
  from cinder import db
+ from cinder.db.sqlalchemy import api as sqlalchemy_api
  from cinder import exception
 -from cinder.quota import ReservableResource
 +from cinder import quota
  from cinder import test