From 7d6c4ec8cd91ccfdd1a384b7f125af504f2ff589 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Fri, 4 Mar 2016 04:03:29 +0000 Subject: [PATCH] Refreshed / rebased patches. --- debian/changelog | 1 + debian/patches/no-zfssa-tests.patch | 2 +- debian/patches/remove-zfssa-from-opts.py.patch | 10 ++++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 23b5836f4..0f32d7374 100644 --- 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 f686b90b2..e8003777c 100644 --- a/debian/patches/no-zfssa-tests.patch +++ b/debian/patches/no-zfssa-tests.patch @@ -3,7 +3,7 @@ Author: Thomas Goirand 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 99f872ad9..cf9e6469b 100644 --- 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 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], -- 2.45.2