Refreshed patches.

Rewritten-From: 40e8285490ad61526cff00e16aff7f096ffeda38

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index bea8886d7d5fdc55dae8fef08b275e8d6cc57c14..6c8e424173e9c0120d00ec96e061b6ede2536af1 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -2,6 +2,7 @@ cinder (2:9.0.0~b1-1) experimental; urgency=medium
 
   * New upstream release.
   * Fixed (build-)depends for this release.
+  * Refreshed patches.
 
  -- Thomas Goirand <zigo@debian.org>  Thu, 09 Jun 2016 09:31:38 +0200
 

diff --git a/xenial/debian/patches/remove-zfssa-from-opts.py.patch b/xenial/debian/patches/remove-zfssa-from-opts.py.patch
index bf24746f1e62061e92f00e12c18a0cc498b2838a..1ee3e0e6b4caa283b669f5033c220070a695653b 100644 (file)
--- a/xenial/debian/patches/remove-zfssa-from-opts.py.patch
+++ b/xenial/debian/patches/remove-zfssa-from-opts.py.patch
@@ -7,7 +7,7 @@ Index: cinder/cinder/opts.py
 ===================================================================
 --- cinder.orig/cinder/opts.py
 +++ cinder/cinder/opts.py
-@@ -157,10 +157,6 @@ from cinder.volume.drivers import vzstor
+@@ -158,10 +158,6 @@ from cinder.volume.drivers import vzstor
  from cinder.volume.drivers.windows import windows as \
      cinder_volume_drivers_windows_windows
  from cinder.volume.drivers import xio as cinder_volume_drivers_xio
@@ -18,7 +18,7 @@ Index: cinder/cinder/opts.py
  from cinder.volume import manager as cinder_volume_manager
  from cinder.wsgi import eventlet_server as cinder_wsgi_eventletserver
  from cinder.zonemanager.drivers.brocade import brcd_fabric_opts as \
-@@ -266,7 +262,6 @@ def list_opts():
+@@ -267,7 +263,6 @@ def list_opts():
                  cinder_volume_drivers_xio.XIO_OPTS,
                  cinder_volume_drivers_ibm_storwize_svc_storwizesvcfc.
                  storwize_svc_fc_opts,
@@ -26,11 +26,11 @@ Index: cinder/cinder/opts.py
                  cinder_volume_driver.volume_opts,
                  cinder_volume_driver.iser_opts,
                  cinder_api_views_versions.versions_opts,
-@@ -308,7 +303,6 @@ def list_opts():
+@@ -309,7 +304,6 @@ def list_opts():
                  cinder_volume_drivers_blockbridge.blockbridge_opts,
                  [cinder_scheduler_scheduleroptions.
                      scheduler_json_config_location_opt],
 -                cinder_volume_drivers_zfssa_zfssanfs.ZFSSA_OPTS,
                  cinder_volume_drivers_disco_disco.disco_opts,
                  cinder_volume_drivers_hgst.hgst_opts,
-                 cinder_image_imageutils.image_helper_opts,
+                 cinder_message_api.messages_opts,