From 6bef17630884e55561f9e532cb935c270ae113dcc64a5d377d08fe5703a20905 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Thu, 9 Apr 2015 12:31:30 +0000 Subject: [PATCH] - PE: Turn off legacy unpacking of resource options into the meta hashtable - acl: Do not delay evaluation of added nodes in some situations - docker-wrapper: add demote, promote, and notify actions for multistate rsc - docker-wrapper: properly forward key value pairs during isolation - attrd: fixes double free in attrd legacy - lrmd: do not let isolation wrappers inherit the wrapper attribute, or it makes a loop - pengine: pass node name of pcmk host into isolated resources - lrmd: isolation wrappers are moved from containers to isolation OCF namepace - pengine: Fix colocation with unmanaged resources - stonith-ng: Correctly track node state - stonith-ng: No reply is needed for CRM_OP_RM_NODE_CACHE - crm_resource: Fix output format of the warning from --force-start - crm_resource: Display the locations of all anonymous clone children when supplying the children's common ID (bsc#870339) - cib: Correctly track node state - Upstream version cs: 35e2d8ff0672b61a3aaba3c9bfb74d08875efb46 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=196 --- _service | 2 +- pacemaker-1.1.12.git20150326.3e93bc1.tar.bz2 | 3 --- pacemaker-1.1.12.git20150407.35e2d8f.tar.bz2 | 3 +++ pacemaker.changes | 19 +++++++++++++++++++ pacemaker.spec | 4 ++-- 5 files changed, 25 insertions(+), 6 deletions(-) delete mode 100644 pacemaker-1.1.12.git20150326.3e93bc1.tar.bz2 create mode 100644 pacemaker-1.1.12.git20150407.35e2d8f.tar.bz2 diff --git a/_service b/_service index 1336dda..1715222 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 1.1.12 --> 1.1.12.git%cd.%h - 3e93bc1dd6c1c3f2ee101f754567aa007b24bb5e + 35e2d8ff0672b61a3aaba3c9bfb74d08875efb46 diff --git a/pacemaker-1.1.12.git20150326.3e93bc1.tar.bz2 b/pacemaker-1.1.12.git20150326.3e93bc1.tar.bz2 deleted file mode 100644 index 0af82d9..0000000 --- a/pacemaker-1.1.12.git20150326.3e93bc1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb261c04ef0c746ca0f690856d9bdd23374d50accc938d08805df2176f64ff60 -size 9567712 diff --git a/pacemaker-1.1.12.git20150407.35e2d8f.tar.bz2 b/pacemaker-1.1.12.git20150407.35e2d8f.tar.bz2 new file mode 100644 index 0000000..35f96ba --- /dev/null +++ b/pacemaker-1.1.12.git20150407.35e2d8f.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ec4217bc295a1b6c1a1f25a98c956ff6e78f43bdd5f5b178c9ae35849185f57 +size 9567066 diff --git a/pacemaker.changes b/pacemaker.changes index 06888d6..6baaac7 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Thu Apr 9 12:29:56 UTC 2015 - ygao@suse.com + +- PE: Turn off legacy unpacking of resource options into the meta hashtable +- acl: Do not delay evaluation of added nodes in some situations +- docker-wrapper: add demote, promote, and notify actions for multistate rsc +- docker-wrapper: properly forward key value pairs during isolation +- attrd: fixes double free in attrd legacy +- lrmd: do not let isolation wrappers inherit the wrapper attribute, or it makes a loop +- pengine: pass node name of pcmk host into isolated resources +- lrmd: isolation wrappers are moved from containers to isolation OCF namepace +- pengine: Fix colocation with unmanaged resources +- stonith-ng: Correctly track node state +- stonith-ng: No reply is needed for CRM_OP_RM_NODE_CACHE +- crm_resource: Fix output format of the warning from --force-start +- crm_resource: Display the locations of all anonymous clone children when supplying the children's common ID (bsc#870339) +- cib: Correctly track node state +- Upstream version cs: 35e2d8ff0672b61a3aaba3c9bfb74d08875efb46 + ------------------------------------------------------------------- Fri Mar 27 15:09:25 UTC 2015 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index 69d3532..0e967ef 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.git20150326.3e93bc1 +Version: 1.1.12.git20150407.35e2d8f Release: 0 #Release: %{pcmk_release}%{?dist} Url: http://www.clusterlabs.org @@ -657,7 +657,7 @@ fi %dir /usr/lib/ocf %dir /usr/lib/ocf/resource.d /usr/lib/ocf/resource.d/pacemaker -/usr/lib/ocf/resource.d/containers +/usr/lib/ocf/resource.d/isolation %if 0%{?cs_version} < 2 %{_libexecdir}/lcrso/pacemaker.lcrso