From 2ba784aaeffd88fc2eaddf0b8c40933b12a0a290822b40e37a433b8c437be1ea Mon Sep 17 00:00:00 2001
From: Yan Gao <ygao@suse.com>
Date: Thu, 7 May 2015 10:36:59 +0000
Subject: [PATCH] Accepting request 305719 from
home:yan_gao:branches:network:ha-clustering:Factory:Test
- pengine: process rsc parameters during unpack (bsc#929842)
- pengine: handle setting container attribute in the correct location (bsc#929842)
- lrmd: move isolation wrappers to hidden directory (bsc#929842)
- mainloop: resolves race condition mainloop poll involving modification of ipc connections (bsc#929835)
- Upstream version cs: f47ea56b4ec23c7d8e0c129535a9b49cdbd80482
OBS-URL: https://build.opensuse.org/request/show/305719
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=207
---
_service | 2 +-
pacemaker-1.1.12.git20150430.195559d.tar.bz2 | 3 ---
pacemaker-1.1.12.git20150504.f47ea56.tar.bz2 | 3 +++
pacemaker.changes | 9 +++++++++
pacemaker.spec | 4 ++--
5 files changed, 15 insertions(+), 6 deletions(-)
delete mode 100644 pacemaker-1.1.12.git20150430.195559d.tar.bz2
create mode 100644 pacemaker-1.1.12.git20150504.f47ea56.tar.bz2
diff --git a/_service b/_service
index f168775..7a23f39 100644
--- a/_service
+++ b/_service
@@ -11,7 +11,7 @@
<param name="version">1.1.12</param>
-->
<param name="versionformat">1.1.12.git%cd.%h</param>
- <param name="revision">195559d47b0e9186b5d131981f6f7fee96ecad76</param>
+ <param name="revision">f47ea56b4ec23c7d8e0c129535a9b49cdbd80482</param>
</service>
<service name="recompress" mode="disabled">
diff --git a/pacemaker-1.1.12.git20150430.195559d.tar.bz2 b/pacemaker-1.1.12.git20150430.195559d.tar.bz2
deleted file mode 100644
index e3d9c57..0000000
--- a/pacemaker-1.1.12.git20150430.195559d.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:270075bb98240f52d081fb85b1fb4040d774b5fc573622a0bb63277b6315d792
-size 9565850
diff --git a/pacemaker-1.1.12.git20150504.f47ea56.tar.bz2 b/pacemaker-1.1.12.git20150504.f47ea56.tar.bz2
new file mode 100644
index 0000000..00fa6e9
--- /dev/null
+++ b/pacemaker-1.1.12.git20150504.f47ea56.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d144750ddc19cdc0fd42cd6a6a17879214c65745d957ae55d3927d148ba68430
+size 9565025
diff --git a/pacemaker.changes b/pacemaker.changes
index c2f2f97..74fa8ae 100644
--- a/pacemaker.changes
+++ b/pacemaker.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed May 6 09:57:05 UTC 2015 - ygao@suse.com
+
+- pengine: process rsc parameters during unpack (bsc#929842)
+- pengine: handle setting container attribute in the correct location (bsc#929842)
+- lrmd: move isolation wrappers to hidden directory (bsc#929842)
+- mainloop: resolves race condition mainloop poll involving modification of ipc connections (bsc#929835)
+- Upstream version cs: f47ea56b4ec23c7d8e0c129535a9b49cdbd80482
+
-------------------------------------------------------------------
Thu Apr 30 11:31:46 UTC 2015 - ygao@suse.com
diff --git a/pacemaker.spec b/pacemaker.spec
index 11bb28b..8901fe5 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.git20150430.195559d
+Version: 1.1.12.git20150504.f47ea56
Release: 0
#Release: %{pcmk_release}%{?dist}
Url: http://www.clusterlabs.org
@@ -682,7 +682,7 @@ fi
%dir /usr/lib/ocf
%dir /usr/lib/ocf/resource.d
/usr/lib/ocf/resource.d/pacemaker
-/usr/lib/ocf/resource.d/isolation
+/usr/lib/ocf/resource.d/.isolation
%if 0%{?cs_version} < 2
%{_libexecdir}/lcrso/pacemaker.lcrso