From 09ad3ccbbeb0dcb62ceedd8b150850b522cefaa649a7dd7d72a2f8973bbe1f89 Mon Sep 17 00:00:00 2001
From: Yan Gao <ygao@suse.com>
Date: Tue, 28 Jan 2014 08:12:10 +0000
Subject: [PATCH] - pengine: Free memory allocated by find_actions() - cib: Fix
 remote cib based on TLS - Upstream version cs:
 f3eeaf49d1fb7bca713ecbbc819aef51650d26ef

- stonith: Drop the severity of log for recoverable condition (bnc#857779)
  * Update bug-812269_pacemaker-fencing-device-register-messages.patch

OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=104
---
 _service                                        |  2 +-
 ...maker-fencing-device-register-messages.patch | 17 +++++++++++++++--
 pacemaker-1.1.10+git20140124.96cd194.tar.bz2    |  3 ---
 pacemaker-1.1.10+git20140127.f3eeaf4.tar.bz2    |  3 +++
 pacemaker.changes                               | 13 +++++++++++++
 pacemaker.spec                                  |  2 +-
 6 files changed, 33 insertions(+), 7 deletions(-)
 delete mode 100644 pacemaker-1.1.10+git20140124.96cd194.tar.bz2
 create mode 100644 pacemaker-1.1.10+git20140127.f3eeaf4.tar.bz2

diff --git a/_service b/_service
index 8b4c570..2f6f6d9 100644
--- a/_service
+++ b/_service
@@ -11,7 +11,7 @@
     <param name="version">1.1.10</param>
 -->
     <param name="versionformat">1.1.10+git%cd.%h</param>
-    <param name="revision">96cd1941308be48fdf1e827b88ebd9410cf2010a</param>
+    <param name="revision">f3eeaf49d1fb7bca713ecbbc819aef51650d26ef</param>
   </service>
 
   <service name="recompress" mode="disabled">
diff --git a/bug-812269_pacemaker-fencing-device-register-messages.patch b/bug-812269_pacemaker-fencing-device-register-messages.patch
index 74b3749..fa6cc7e 100644
--- a/bug-812269_pacemaker-fencing-device-register-messages.patch
+++ b/bug-812269_pacemaker-fencing-device-register-messages.patch
@@ -8,7 +8,7 @@ Index: pacemaker/fencing/commands.c
 ===================================================================
 --- pacemaker.orig/fencing/commands.c
 +++ pacemaker/fencing/commands.c
-@@ -816,7 +816,7 @@ stonith_device_register(xmlNode * msg, c
+@@ -817,7 +817,7 @@ stonith_device_register(xmlNode * msg, c
  
      dup = device_has_duplicate(device);
      if (dup) {
@@ -17,7 +17,7 @@ Index: pacemaker/fencing/commands.c
                     g_hash_table_size(device_list));
          free_device(device);
          device = dup;
-@@ -839,7 +839,7 @@ stonith_device_register(xmlNode * msg, c
+@@ -840,7 +840,7 @@ stonith_device_register(xmlNode * msg, c
          }
          g_hash_table_replace(device_list, device->id, device);
  
@@ -26,3 +26,16 @@ Index: pacemaker/fencing/commands.c
                     g_hash_table_size(device_list));
      }
      if (desc) {
+Index: pacemaker/fencing/main.c
+===================================================================
+--- pacemaker.orig/fencing/main.c
++++ pacemaker/fencing/main.c
+@@ -878,7 +878,7 @@ update_cib_cache_cb(const char *event, x
+         switch (rc) {
+             case -pcmk_err_diff_resync:
+             case -pcmk_err_diff_failed:
+-                crm_notice("[%s] Patch aborted: %s (%d)", event, pcmk_strerror(rc), rc);
++                crm_info("[%s] Patch aborted: %s (%d)", event, pcmk_strerror(rc), rc);
+             case pcmk_ok:
+                 break;
+             default:
diff --git a/pacemaker-1.1.10+git20140124.96cd194.tar.bz2 b/pacemaker-1.1.10+git20140124.96cd194.tar.bz2
deleted file mode 100644
index 791b905..0000000
--- a/pacemaker-1.1.10+git20140124.96cd194.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d9a2ba6bb2dece3d5ac383ce62fd1e9559493ea6cec9e62f2ce4443e855fe1a3
-size 9350450
diff --git a/pacemaker-1.1.10+git20140127.f3eeaf4.tar.bz2 b/pacemaker-1.1.10+git20140127.f3eeaf4.tar.bz2
new file mode 100644
index 0000000..44a5070
--- /dev/null
+++ b/pacemaker-1.1.10+git20140127.f3eeaf4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3099c881552ab006f6bbf94300e664583a7350008e2869b6680f5457fe67ca18
+size 9350832
diff --git a/pacemaker.changes b/pacemaker.changes
index 63c5e90..68e25eb 100644
--- a/pacemaker.changes
+++ b/pacemaker.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Jan 28 04:00:43 UTC 2014 - ygao@suse.com
+
+- pengine: Free memory allocated by find_actions()
+- cib: Fix remote cib based on TLS
+- Upstream version cs: f3eeaf49d1fb7bca713ecbbc819aef51650d26ef
+
+-------------------------------------------------------------------
+Tue Jan 28 03:47:02 UTC 2014 - ygao@suse.com
+
+- stonith: Drop the severity of log for recoverable condition (bnc#857779)
+  * Update bug-812269_pacemaker-fencing-device-register-messages.patch
+
 -------------------------------------------------------------------
 Sat Jan 25 06:22:21 UTC 2014 - ygao@suse.com
 
diff --git a/pacemaker.spec b/pacemaker.spec
index 304df52..df3b437 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -95,7 +95,7 @@ Name:           pacemaker
 Summary:        Scalable High-Availability cluster resource manager
 License:        GPL-2.0+ and LGPL-2.1+
 Group:          Productivity/Clustering/HA
-Version:        1.1.10+git20140124.96cd194
+Version:        1.1.10+git20140127.f3eeaf4
 Release:        0
 #Release:        %{pcmk_release}%{?dist}
 Url:            http://www.clusterlabs.org