diff --git a/_service b/_service index 1336dda..9892e55 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 1.1.12 --> 1.1.12.git%cd.%h - 3e93bc1dd6c1c3f2ee101f754567aa007b24bb5e + 7a2e3ae6b736621933b24f4cdc9ea260021d878d 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.git20150413.7a2e3ae.tar.bz2 b/pacemaker-1.1.12.git20150413.7a2e3ae.tar.bz2 new file mode 100644 index 0000000..11c477d --- /dev/null +++ b/pacemaker-1.1.12.git20150413.7a2e3ae.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f5b3f6defb158754ffb6c027b11099aa2b1597e91c4dbeb92cad95098ed0e884 +size 9563881 diff --git a/pacemaker-NodeUtilization-RA.patch b/pacemaker-NodeUtilization-RA.patch index b0ea547..dcb9b95 100644 --- a/pacemaker-NodeUtilization-RA.patch +++ b/pacemaker-NodeUtilization-RA.patch @@ -16,7 +16,7 @@ Index: pacemaker/extra/resources/Makefile.am + remote \ + NodeUtilization - containertech_SCRIPTS = docker-wrapper + isolationtech_SCRIPTS = docker-wrapper Index: pacemaker/extra/resources/NodeUtilization =================================================================== diff --git a/pacemaker.changes b/pacemaker.changes index 06888d6..b4d496e 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Mon Apr 13 08:57:35 UTC 2015 - ygao@suse.com + +- Rebase: + * pacemaker-NodeUtilization-RA.patch + +- docker-wrapper: per resource logging of lrmd and remote client tool +- pengine: Avoid trailing whitespaces when printing resource state +- pengine: cl#5207 - Display "UNCLEAN" for resources running on unclean offline nodes +- docker-wrapper: add reuse option for presistent containers +- docker-wrapper: only override exit reason if docker daemon is inactive +- pengine: handle isolated resource scenario, cloned group of isolated resources +- pengine: handle cloned isolated resources in a sane way +- crm_report: More patterns for finding logs on non-DC nodes +- lrmd: Use original timestamps when reporting multi-step systemd operations +- lrmd: report original timeout when systemd operation completes +- systemd: improve unit files +- PE: Turn off legacy unpacking of resource options into the meta hashtable +- acl: Do not delay evaluation of added nodes in some situations (bsc#927828: CVE-2015-1867) +- 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: 7a2e3ae6b736621933b24f4cdc9ea260021d878d + ------------------------------------------------------------------- Fri Mar 27 15:09:25 UTC 2015 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index 69d3532..17207cd 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.git20150413.7a2e3ae 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