From f12c2c9cd95b21f09af59f5733a8c95aa615a2b836cc4e327c04bd3b59137b0d Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Thu, 15 Jan 2015 17:33:59 +0000 Subject: [PATCH] - pengine: fixes pengine crash with orphaned remote node connection resource - Upstream version cs: 70f472e1c08e3d977de39cf75b47b04d541eaab2 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=181 --- _service | 2 +- pacemaker-1.1.12.git20150113.c529898.tar.bz2 | 3 --- pacemaker-1.1.12.git20150115.70f472e.tar.bz2 | 3 +++ pacemaker.changes | 5 +++-- pacemaker.spec | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 pacemaker-1.1.12.git20150113.c529898.tar.bz2 create mode 100644 pacemaker-1.1.12.git20150115.70f472e.tar.bz2 diff --git a/_service b/_service index c2ff5f2..78b6521 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 1.1.12 --> 1.1.12.git%cd.%h - c529898ac8a580ff32869fd9e715d7c086ba2a10 + 70f472e1c08e3d977de39cf75b47b04d541eaab2 diff --git a/pacemaker-1.1.12.git20150113.c529898.tar.bz2 b/pacemaker-1.1.12.git20150113.c529898.tar.bz2 deleted file mode 100644 index c141218..0000000 --- a/pacemaker-1.1.12.git20150113.c529898.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a785d8da05ef2fc7b72959cf97926236dad0df258bc2dcdee1125f4c6839f95d -size 9369474 diff --git a/pacemaker-1.1.12.git20150115.70f472e.tar.bz2 b/pacemaker-1.1.12.git20150115.70f472e.tar.bz2 new file mode 100644 index 0000000..6da2d88 --- /dev/null +++ b/pacemaker-1.1.12.git20150115.70f472e.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a470eca3ebc1e3fed6c6fa15277c1da3a8d9f9a0e13d4a31ba80127479229d16 +size 9389298 diff --git a/pacemaker.changes b/pacemaker.changes index 2762cf2..58c2314 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,9 +1,10 @@ ------------------------------------------------------------------- -Thu Jan 15 13:42:35 UTC 2015 - ygao@suse.com +Thu Jan 15 17:32:14 UTC 2015 - ygao@suse.com +- pengine: fixes pengine crash with orphaned remote node connection resource - PE: Do not aggregate children in a pending state into the started/stopped/etc lists - acl: Correctly implement the 'reference' acl directive -- Upstream version cs: c529898ac8a580ff32869fd9e715d7c086ba2a10 +- Upstream version cs: 70f472e1c08e3d977de39cf75b47b04d541eaab2 ------------------------------------------------------------------- Mon Jan 12 11:05:14 UTC 2015 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index 82e5dd3..b8173ce 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.git20150113.c529898 +Version: 1.1.12.git20150115.70f472e Release: 0 #Release: %{pcmk_release}%{?dist} Url: http://www.clusterlabs.org