Refreshed / rebased patches.

diff --git a/debian/changelog b/debian/changelog
index 23b5836f45e894c6a498ce741f7108fbb37635ae..0f32d7374aff463e0328e7e019603ebfa7ce8a47 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ cinder (2:8.0.0~b3-1) experimental; urgency=medium
   * New (build-)depends on python-oauth2client to ensure its version.
   * Added missing build-depends on git, needed by sphinx-build.
   * Fixed config file generation.
+  * Refreshed / rebased patches.
 
   [ Ondřej Nový ]
   * Fixed homepage (https).

diff --git a/debian/patches/no-zfssa-tests.patch b/debian/patches/no-zfssa-tests.patch
index f686b90b26a5dfdc30108394fc28dca751887773..e8003777c5dcedb833760d6957dd88534f13e045 100644 (file)
--- a/debian/patches/no-zfssa-tests.patch
+++ b/debian/patches/no-zfssa-tests.patch
@@ -3,7 +3,7 @@ Author: Thomas Goirand <zigo@debian.org>
 Forwarded: not-needed
 Last-Update: 2015-01-22
 
---- cinder/tests/unit/test_zfssa.py    2016-03-04 03:58:20.261889747 +0000
+--- a/cinder/tests/unit/test_zfssa.py  2016-03-04 03:58:20.261889747 +0000
 +++ /dev/null  2015-11-25 10:13:06.495404578 +0000
 @@ -1,1718 +0,0 @@
 -# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.

diff --git a/debian/patches/remove-zfssa-from-opts.py.patch b/debian/patches/remove-zfssa-from-opts.py.patch
index 99f872ad942ba3b338c60f5a5274879dbe7c0391..cf9e6469b1d0af3dc57d2b502a1a6019882b4b79 100644 (file)
--- a/debian/patches/remove-zfssa-from-opts.py.patch
+++ b/debian/patches/remove-zfssa-from-opts.py.patch
@@ -3,8 +3,10 @@ Author: Thomas Goirand <zigo@debian.org>
 Forwarded: no
 Last-Update: 2016-01-02
 
---- cinder-8.0.0~b2.orig/cinder/opts.py
-+++ cinder-8.0.0~b2/cinder/opts.py
+Index: cinder/cinder/opts.py
+===================================================================
+--- cinder.orig/cinder/opts.py
++++ cinder/cinder/opts.py
 @@ -158,10 +158,6 @@ from cinder.volume.drivers import vzstor
  from cinder.volume.drivers.windows import windows as \
      cinder_volume_drivers_windows_windows
@@ -16,7 +18,7 @@ Last-Update: 2016-01-02
  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 \
-@@ -268,7 +264,6 @@ def list_opts():
+@@ -263,7 +259,6 @@ def list_opts():
                  cinder_volume_drivers_xio.XIO_OPTS,
                  cinder_volume_drivers_ibm_storwize_svc_storwizesvcfc.
                  storwize_svc_fc_opts,
@@ -24,7 +26,7 @@ Last-Update: 2016-01-02
                  cinder_volume_driver.volume_opts,
                  cinder_volume_driver.iser_opts,
                  cinder_api_views_versions.versions_opts,
-@@ -309,7 +304,6 @@ def list_opts():
+@@ -305,7 +300,6 @@ def list_opts():
                  cinder_volume_drivers_blockbridge.blockbridge_opts,
                  [cinder_scheduler_scheduleroptions.
                      scheduler_json_config_location_opt],