housekeeping: patch refresh

Bitbake now prints warnings when a patch is successfully applied but
there is fuzz or an offset. The following refreshes patches for
several packages which report warnings when openstack-image-controller
is built.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

1 files changed, 12 insertions, 6 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer/fix_ceilometer_memory_leak.patch b/meta-openstack/recipes-devtools/python/python-ceilometer/fix_ceilometer_memory_leak.patch
index bdc1bf7..9581e90 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometer/fix_ceilometer_memory_leak.patch
+++ b/meta-openstack/recipes-devtools/python/python-ceilometer/fix_ceilometer_memory_leak.patch
@@ -1,10 +1,16 @@
+From fd4b8446cf3cf01a21f4b4a43897fe2603be5aba Mon Sep 17 00:00:00 2001
+From: Amy Fong <amy.fong@windriver.com>
+Date: Fri, 28 Mar 2014 15:58:45 -0400
+
 ---
- ceilometer/nova_client.py |    7 +++++++
+ ceilometer/nova_client.py | 7 +++++++
  1 file changed, 7 insertions(+)
 
+diff --git a/ceilometer/nova_client.py b/ceilometer/nova_client.py
+index 084c4ea..0219d00 100644
 --- a/ceilometer/nova_client.py
 +++ b/ceilometer/nova_client.py
-@@ -26,6 +26,12 @@
+@@ -38,6 +38,12 @@ cfg.CONF.import_group('service_credentials', 'ceilometer.service')
  
  LOG = log.getLogger(__name__)
  
@@ -17,11 +23,11 @@
  
  def logged(func):
  
-@@ -56,6 +62,7 @@
-             endpoint_type=conf.os_endpoint_type,
-             cacert=conf.os_cacert,
+@@ -75,6 +81,7 @@ class Client(object):
+             timeout=cfg.CONF.http_timeout,
+             http_log_debug=cfg.CONF.nova_http_log_debug,
              no_cache=True)
 +        self.nova_client.set_timings_max_len(cfg.CONF.nova_client.max_timing_buffer)
  
      def _with_flavor_and_image(self, instances):
-         for instance in instances:
+         flavor_cache = {}