From f5da6fafa35134b1bf175dd51760a418ff676a92 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 15 Oct 2014 06:12:23 +0000 Subject: [PATCH] Removed Add_oslo.db_to_config_generator.patch applied upstream. Rewritten-From: 3501aacaf52c688e31ffdacbbd184e9558d7c6dd --- xenial/debian/changelog | 1 + .../Add_oslo.db_to_config_generator.patch | 18 ------------------ xenial/debian/patches/series | 1 - 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 xenial/debian/patches/Add_oslo.db_to_config_generator.patch delete mode 100644 xenial/debian/patches/series diff --git a/xenial/debian/changelog b/xenial/debian/changelog index 9a40b48..de10fd6 100644 --- a/xenial/debian/changelog +++ b/xenial/debian/changelog @@ -2,6 +2,7 @@ ceilometer (2014.2~rc3-1) experimental; urgency=medium * New upstream release. * Added missing configuration files in ceilometer-common. + * Removed Add_oslo.db_to_config_generator.patch applied upstream. -- Thomas Goirand Wed, 15 Oct 2014 14:02:53 +0800 diff --git a/xenial/debian/patches/Add_oslo.db_to_config_generator.patch b/xenial/debian/patches/Add_oslo.db_to_config_generator.patch deleted file mode 100644 index 21d4c5d..0000000 --- a/xenial/debian/patches/Add_oslo.db_to_config_generator.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Add oslo.db to config generator - Otherwise we miss the oslo.db configuration option in the sample config file. -From: Julien Danjou -Origin: upstream, https://review.openstack.org/#/c/127543/ -Date: Fri, 10 Oct 2014 14:25:58 +0000 (+0200) -X-Git-Url: https://review.openstack.org/gitweb?p=openstack%2Fceilometer.git;a=commitdiff_plain;h=e179a8382c88374c7fefcb8f1295257a740b7668 -Bug-Ubuntu: https://launchpad.net/bugs/1379808 -Change-Id: I3a70e5da42562081002286d37ba1a200150c8cfc -Last-Update: 2014-10-10 - -diff --git a/tools/config/oslo.config.generator.rc b/tools/config/oslo.config.generator.rc -index d964585..122e9fe 100644 ---- a/tools/config/oslo.config.generator.rc -+++ b/tools/config/oslo.config.generator.rc -@@ -1,2 +1,2 @@ --CEILOMETER_CONFIG_GENERATOR_EXTRA_LIBRARIES=oslo.messaging -+CEILOMETER_CONFIG_GENERATOR_EXTRA_LIBRARIES="oslo.messaging oslo.db" - CEILOMETER_CONFIG_GENERATOR_EXTRA_MODULES=keystonemiddleware.auth_token diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series deleted file mode 100644 index 59a1394..0000000 --- a/xenial/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -Add_oslo.db_to_config_generator.patch -- 2.32.3