From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 25 Feb 2016 00:38:03 +0000 (+0000)
Subject: Merge "cinder-api-microversions code"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=26ac08ca79bb9e69d63a4a3cead567556bb31c97;p=openstack-build%2Fcinder-build.git

Merge "cinder-api-microversions code"
---

26ac08ca79bb9e69d63a4a3cead567556bb31c97
diff --cc cinder/opts.py
index dc674dd59,5d96618b0..aebbfd072
--- a/cinder/opts.py
+++ b/cinder/opts.py
@@@ -17,9 -17,7 +17,8 @@@ import itertool
  from cinder.api import common as cinder_api_common
  from cinder.api.middleware import auth as cinder_api_middleware_auth
  from cinder.api.middleware import sizelimit as cinder_api_middleware_sizelimit
- from cinder.api.v2 import volumes as cinder_api_v2_volumes
  from cinder.api.views import versions as cinder_api_views_versions
 +from cinder.backup import api as cinder_backup_api
  from cinder.backup import chunkeddriver as cinder_backup_chunkeddriver
  from cinder.backup import driver as cinder_backup_driver
  from cinder.backup.drivers import ceph as cinder_backup_drivers_ceph