diff --git a/_service b/_service index eb528b8..3b6a03a 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 1.1.12 --> 1.1.12.git%cd.%h - 3cf5ba7c407a460f1fd9baed13c94a8a24f4d34b + 3263963bf0f5ef2ecc88e7806a59af09e017de28 diff --git a/pacemaker-1.1.12.git20150410.3263963.tar.bz2 b/pacemaker-1.1.12.git20150410.3263963.tar.bz2 new file mode 100644 index 0000000..1ddc1b4 --- /dev/null +++ b/pacemaker-1.1.12.git20150410.3263963.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a79247681abbd926d9cbd1c97beab41e2fd4282997c2b3ecb9643df017e68189 +size 9563852 diff --git a/pacemaker-1.1.12.git20150410.3cf5ba7.tar.bz2 b/pacemaker-1.1.12.git20150410.3cf5ba7.tar.bz2 deleted file mode 100644 index d86f933..0000000 --- a/pacemaker-1.1.12.git20150410.3cf5ba7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b8758b69781851a533cdd83f86315aa6c55ce49c1edf003e1813047a4e0ca7ad -size 9566216 diff --git a/pacemaker.changes b/pacemaker.changes index f7ab8f8..b405fd9 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,9 +1,12 @@ ------------------------------------------------------------------- -Fri Apr 10 12:48:23 UTC 2015 - ygao@suse.com +Fri Apr 10 17:31:24 UTC 2015 - ygao@suse.com - Rebase: * pacemaker-NodeUtilization-RA.patch +- 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 @@ -22,7 +25,7 @@ Fri Apr 10 12:48:23 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: 3cf5ba7c407a460f1fd9baed13c94a8a24f4d34b +- Upstream version cs: 3263963bf0f5ef2ecc88e7806a59af09e017de28 ------------------------------------------------------------------- Fri Mar 27 15:09:25 UTC 2015 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index 160f4bc..c572a44 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.3cf5ba7 +Version: 1.1.12.git20150410.3263963 Release: 0 #Release: %{pcmk_release}%{?dist} Url: http://www.clusterlabs.org