From dffa9736d59dcd3526fe5a764cfc2df2cba73ffb Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 9 Jun 2016 07:43:30 +0000 Subject: [PATCH] Refreshed patches. Rewritten-From: 40e8285490ad61526cff00e16aff7f096ffeda38 --- xenial/debian/changelog | 1 + xenial/debian/patches/remove-zfssa-from-opts.py.patch | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/xenial/debian/changelog b/xenial/debian/changelog index bea8886d7..6c8e42417 100644 --- 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 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 bf24746f1..1ee3e0e6b 100644 --- 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, -- 2.45.2