From 29b8fc441bfe9296da85e522613ca55c55670deeacaae8b9887e2ce91ee52aa9 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Wed, 27 Aug 2014 11:31:22 +0000 Subject: [PATCH 1/2] - logging: correctly initialized default log file (bnc#883567) - Upstream version cs: 362f181a387e0a0a9f04e0da84d6c5906d71dd20 - services: Remove cancelled recurring ops from internal lists as early as possible (bnc#888586) - services: Remove file descriptors from mainloop as soon as we have drained them (bnc#888586) OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=160 --- pacemaker-1.1.12.git20140818.dad4ceb.tar.bz2 | 3 --- pacemaker-1.1.12.git20140825.362f181.tar.bz2 | 3 +++ pacemaker.changes | 10 ++++++++-- pacemaker.spec | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) delete mode 100644 pacemaker-1.1.12.git20140818.dad4ceb.tar.bz2 create mode 100644 pacemaker-1.1.12.git20140825.362f181.tar.bz2 diff --git a/pacemaker-1.1.12.git20140818.dad4ceb.tar.bz2 b/pacemaker-1.1.12.git20140818.dad4ceb.tar.bz2 deleted file mode 100644 index 48d83fe..0000000 --- a/pacemaker-1.1.12.git20140818.dad4ceb.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a0d6012ac7b3495a808d642cefd5863958ebe78148d57d7898d25ad1b08cbfe2 -size 9330699 diff --git a/pacemaker-1.1.12.git20140825.362f181.tar.bz2 b/pacemaker-1.1.12.git20140825.362f181.tar.bz2 new file mode 100644 index 0000000..9c38b8a --- /dev/null +++ b/pacemaker-1.1.12.git20140825.362f181.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b2857de3a3eef5ee994f8008e7af1334f1c51f0f28780ac0fb856a29ca89452 +size 9331789 diff --git a/pacemaker.changes b/pacemaker.changes index dcd6f8e..782500b 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 27 11:27:38 UTC 2014 - ygao@suse.com + +- logging: correctly initialized default log file (bnc#883567) +- Upstream version cs: 362f181a387e0a0a9f04e0da84d6c5906d71dd20 + ------------------------------------------------------------------- Mon Aug 18 08:02:31 UTC 2014 - ygao@suse.com @@ -114,8 +120,8 @@ Wed Jun 11 05:44:21 UTC 2014 - ygao@suse.com - Fencing: Cache metadata lookups to avoid repeated blocking during device registration - pengine: properly place resource within a container when container is a remote-node. - mainloop: Better handle the killing of processes in the act of exiting -- services: Remove cancelled recurring ops from internal lists as early as possible -- services: Remove file descriptors from mainloop as soon as we have drained them +- services: Remove cancelled recurring ops from internal lists as early as possible (bnc#888586) +- services: Remove file descriptors from mainloop as soon as we have drained them (bnc#888586) - pengine: Don't report a resource as restarting when it is a moving multistate resource - pengine: avoid assert by searching for stop action on correct node during LogActions - Upstream version cs: 734e6b538b0a037f9e7d0709f450bd664f26c332 diff --git a/pacemaker.spec b/pacemaker.spec index 89dada0..fbbe99b 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -99,7 +99,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.12.git20140818.dad4ceb +Version: 1.1.12.git20140825.362f181 Release: 0 #Release: %{pcmk_release}%{?dist} Url: http://www.clusterlabs.org From 1121ca4657ee5aa73e0aba878bcc18f96f2bce0a97bb29d1a3a79b7468c52c69 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Fri, 5 Sep 2014 07:37:24 +0000 Subject: [PATCH 2/2] - cluster: Invoke crm_remove_conflicting_peer() only when the new node's uname is being assigned in the node cache (bnc#870771) - mcp: set environment variable which the cluster-glue module needs - services: Refector services os execute function - Upstream version cs: 266d5c2484716111616bcd0f32d9b94bc49baa77 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=162 --- _service | 2 +- pacemaker-1.1.12.git20140825.362f181.tar.bz2 | 3 --- pacemaker-1.1.12.git20140904.266d5c2.tar.bz2 | 3 +++ pacemaker.changes | 8 ++++++++ pacemaker.spec | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 pacemaker-1.1.12.git20140825.362f181.tar.bz2 create mode 100644 pacemaker-1.1.12.git20140904.266d5c2.tar.bz2 diff --git a/_service b/_service index 05c3f85..f756a56 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 1.1.12 --> 1.1.12.git%cd.%h - dad4cebccdb5a4bcdb8fb94e676f6df006ac0846 + 266d5c2484716111616bcd0f32d9b94bc49baa77 diff --git a/pacemaker-1.1.12.git20140825.362f181.tar.bz2 b/pacemaker-1.1.12.git20140825.362f181.tar.bz2 deleted file mode 100644 index 9c38b8a..0000000 --- a/pacemaker-1.1.12.git20140825.362f181.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5b2857de3a3eef5ee994f8008e7af1334f1c51f0f28780ac0fb856a29ca89452 -size 9331789 diff --git a/pacemaker-1.1.12.git20140904.266d5c2.tar.bz2 b/pacemaker-1.1.12.git20140904.266d5c2.tar.bz2 new file mode 100644 index 0000000..80ed757 --- /dev/null +++ b/pacemaker-1.1.12.git20140904.266d5c2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df8d3df106f75ed4d58196bd1b0813bc1cc86977df0b21ee59c1c2cb8044dbf2 +size 9332595 diff --git a/pacemaker.changes b/pacemaker.changes index 782500b..54ca144 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Sep 5 07:33:50 UTC 2014 - ygao@suse.com + +- cluster: Invoke crm_remove_conflicting_peer() only when the new node's uname is being assigned in the node cache (bnc#870771) +- mcp: set environment variable which the cluster-glue module needs +- services: Refector services os execute function +- Upstream version cs: 266d5c2484716111616bcd0f32d9b94bc49baa77 + ------------------------------------------------------------------- Wed Aug 27 11:27:38 UTC 2014 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index fbbe99b..6236d60 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -99,7 +99,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.12.git20140825.362f181 +Version: 1.1.12.git20140904.266d5c2 Release: 0 #Release: %{pcmk_release}%{?dist} Url: http://www.clusterlabs.org