From af774e777aa93c7a3ed1ce6ff8540fb13c995e4b1bebd03a98bab0f359c1f1e4 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Mon, 13 Apr 2015 09:00:29 +0000 Subject: [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 - Upstream version cs: 7a2e3ae6b736621933b24f4cdc9ea260021d878d OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=200 --- _service | 2 +- pacemaker-1.1.12.git20150410.3263963.tar.bz2 | 3 --- pacemaker-1.1.12.git20150413.7a2e3ae.tar.bz2 | 3 +++ pacemaker.changes | 8 ++++++-- pacemaker.spec | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) delete mode 100644 pacemaker-1.1.12.git20150410.3263963.tar.bz2 create mode 100644 pacemaker-1.1.12.git20150413.7a2e3ae.tar.bz2 diff --git a/_service b/_service index 3b6a03a..9892e55 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 1.1.12 --> 1.1.12.git%cd.%h - 3263963bf0f5ef2ecc88e7806a59af09e017de28 + 7a2e3ae6b736621933b24f4cdc9ea260021d878d diff --git a/pacemaker-1.1.12.git20150410.3263963.tar.bz2 b/pacemaker-1.1.12.git20150410.3263963.tar.bz2 deleted file mode 100644 index 1ddc1b4..0000000 --- a/pacemaker-1.1.12.git20150410.3263963.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a79247681abbd926d9cbd1c97beab41e2fd4282997c2b3ecb9643df017e68189 -size 9563852 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.changes b/pacemaker.changes index b405fd9..1c7e38d 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,9 +1,13 @@ ------------------------------------------------------------------- -Fri Apr 10 17:31:24 UTC 2015 - ygao@suse.com +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 @@ -25,7 +29,7 @@ Fri Apr 10 17:31:24 UTC 2015 - ygao@suse.com - 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: 3263963bf0f5ef2ecc88e7806a59af09e017de28 +- Upstream version cs: 7a2e3ae6b736621933b24f4cdc9ea260021d878d ------------------------------------------------------------------- Fri Mar 27 15:09:25 UTC 2015 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index c572a44..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.git20150410.3263963 +Version: 1.1.12.git20150413.7a2e3ae Release: 0 #Release: %{pcmk_release}%{?dist} Url: http://www.clusterlabs.org