- 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
This commit is contained in:
Yan Gao 2014-01-28 08:12:10 +00:00 committed by Git OBS Bridge
parent a403020dcc
commit 09ad3ccbbe
6 changed files with 33 additions and 7 deletions

View File

@ -11,7 +11,7 @@
<param name="version">1.1.10</param> <param name="version">1.1.10</param>
--> -->
<param name="versionformat">1.1.10+git%cd.%h</param> <param name="versionformat">1.1.10+git%cd.%h</param>
<param name="revision">96cd1941308be48fdf1e827b88ebd9410cf2010a</param> <param name="revision">f3eeaf49d1fb7bca713ecbbc819aef51650d26ef</param>
</service> </service>
<service name="recompress" mode="disabled"> <service name="recompress" mode="disabled">

View File

@ -8,7 +8,7 @@ Index: pacemaker/fencing/commands.c
=================================================================== ===================================================================
--- pacemaker.orig/fencing/commands.c --- pacemaker.orig/fencing/commands.c
+++ pacemaker/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); dup = device_has_duplicate(device);
if (dup) { if (dup) {
@ -17,7 +17,7 @@ Index: pacemaker/fencing/commands.c
g_hash_table_size(device_list)); g_hash_table_size(device_list));
free_device(device); free_device(device);
device = dup; 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); g_hash_table_replace(device_list, device->id, device);
@ -26,3 +26,16 @@ Index: pacemaker/fencing/commands.c
g_hash_table_size(device_list)); g_hash_table_size(device_list));
} }
if (desc) { 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:

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d9a2ba6bb2dece3d5ac383ce62fd1e9559493ea6cec9e62f2ce4443e855fe1a3
size 9350450

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3099c881552ab006f6bbf94300e664583a7350008e2869b6680f5457fe67ca18
size 9350832

View File

@ -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 Sat Jan 25 06:22:21 UTC 2014 - ygao@suse.com

View File

@ -95,7 +95,7 @@ Name: pacemaker
Summary: Scalable High-Availability cluster resource manager Summary: Scalable High-Availability cluster resource manager
License: GPL-2.0+ and LGPL-2.1+ License: GPL-2.0+ and LGPL-2.1+
Group: Productivity/Clustering/HA Group: Productivity/Clustering/HA
Version: 1.1.10+git20140124.96cd194 Version: 1.1.10+git20140127.f3eeaf4
Release: 0 Release: 0
#Release: %{pcmk_release}%{?dist} #Release: %{pcmk_release}%{?dist}
Url: http://www.clusterlabs.org Url: http://www.clusterlabs.org