From eed638275efdba1bd90a673ad0b9875867c79e7f0f2948eeb47b0bfa7d521213 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Mon, 3 Mar 2014 09:35:43 +0000 Subject: [PATCH] - Rebase bug-812269_pacemaker-fencing-device-register-messages.patch OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=112 --- ...ker-fencing-device-register-messages.patch | 20 +++++++++---------- pacemaker.changes | 5 +++++ 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/bug-812269_pacemaker-fencing-device-register-messages.patch b/bug-812269_pacemaker-fencing-device-register-messages.patch index fa6cc7e..b7b4aef 100644 --- a/bug-812269_pacemaker-fencing-device-register-messages.patch +++ b/bug-812269_pacemaker-fencing-device-register-messages.patch @@ -4,10 +4,10 @@ Date: Thu Apr 18 16:00:02 2013 +0800 Log: fencing: Drop the severity of the messages on registering a stonith device -Index: pacemaker/fencing/commands.c +Index: pacemaker-1.1.11+git20140303.ca8234d/fencing/commands.c =================================================================== ---- pacemaker.orig/fencing/commands.c -+++ pacemaker/fencing/commands.c +--- pacemaker-1.1.11+git20140303.ca8234d.orig/fencing/commands.c ++++ pacemaker-1.1.11+git20140303.ca8234d/fencing/commands.c @@ -817,7 +817,7 @@ stonith_device_register(xmlNode * msg, c dup = device_has_duplicate(device); @@ -26,16 +26,16 @@ Index: pacemaker/fencing/commands.c g_hash_table_size(device_list)); } if (desc) { -Index: pacemaker/fencing/main.c +Index: pacemaker-1.1.11+git20140303.ca8234d/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) { +--- pacemaker-1.1.11+git20140303.ca8234d.orig/fencing/main.c ++++ pacemaker-1.1.11+git20140303.ca8234d/fencing/main.c +@@ -981,7 +981,7 @@ update_cib_cache_cb(const char *event, x + break; 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: + free_xml(local_cib); + local_cib = NULL; break; - default: diff --git a/pacemaker.changes b/pacemaker.changes index ebaf7f0..42bc972 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 3 09:32:30 UTC 2014 - ygao@suse.com + +- Rebase bug-812269_pacemaker-fencing-device-register-messages.patch + ------------------------------------------------------------------- Mon Mar 3 07:40:22 UTC 2014 - ygao@suse.com