From 17decdc000012f04b57dd1d817876ea1742768d3baf299c7be043abfb106258e Mon Sep 17 00:00:00 2001
From: Yan Gao <ygao@suse.com>
Date: Fri, 30 Jan 2015 10:47:13 +0000
Subject: [PATCH] - pengine: Handle ordering between stateful and migratable
 resources (bsc#881160) - crmd: Check "watchdog" daemon option before setting
 "have-watchdog" property - crmd: Correctly add the local option that
 validates against schema for pengine to calculate - Upstream version cs:
 3021d731fdeba29e1136c117a62f3201785be6ea

OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=184
---
 _service                                     | 2 +-
 pacemaker-1.1.12.git20150116.03ec612.tar.bz2 | 3 ---
 pacemaker-1.1.12.git20150129.3021d73.tar.bz2 | 3 +++
 pacemaker.changes                            | 8 ++++++++
 pacemaker.spec                               | 2 +-
 5 files changed, 13 insertions(+), 5 deletions(-)
 delete mode 100644 pacemaker-1.1.12.git20150116.03ec612.tar.bz2
 create mode 100644 pacemaker-1.1.12.git20150129.3021d73.tar.bz2

diff --git a/_service b/_service
index e4b1add..6344867 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">03ec61210c82471161f6cf3366e8afc30d737d67</param>
+    <param name="revision">3021d731fdeba29e1136c117a62f3201785be6ea</param>
   </service>
 
   <service name="recompress" mode="disabled">
diff --git a/pacemaker-1.1.12.git20150116.03ec612.tar.bz2 b/pacemaker-1.1.12.git20150116.03ec612.tar.bz2
deleted file mode 100644
index d4d2a6a..0000000
--- a/pacemaker-1.1.12.git20150116.03ec612.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fab66b9e25359ed05b4152ca071ede29b298bc28c0bf928b3bbf12f7b2f67509
-size 9389203
diff --git a/pacemaker-1.1.12.git20150129.3021d73.tar.bz2 b/pacemaker-1.1.12.git20150129.3021d73.tar.bz2
new file mode 100644
index 0000000..b8735b8
--- /dev/null
+++ b/pacemaker-1.1.12.git20150129.3021d73.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c80e961a0f0eb3ac56f406178611dbb1fbbd5d1b7ea004b80690098739cab9e6
+size 9484483
diff --git a/pacemaker.changes b/pacemaker.changes
index 3398ad9..b6f79ae 100644
--- a/pacemaker.changes
+++ b/pacemaker.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jan 30 10:37:57 UTC 2015 - ygao@suse.com
+
+- pengine: Handle ordering between stateful and migratable resources (bsc#881160)
+- crmd: Check "watchdog" daemon option before setting "have-watchdog" property
+- crmd: Correctly add the local option that validates against schema for pengine to calculate
+- Upstream version cs: 3021d731fdeba29e1136c117a62f3201785be6ea
+
 -------------------------------------------------------------------
 Fri Jan 16 12:44:34 UTC 2015 - ygao@suse.com
 
diff --git a/pacemaker.spec b/pacemaker.spec
index 401ff4e..b71affb 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.git20150116.03ec612
+Version:        1.1.12.git20150129.3021d73
 Release:        0
 #Release:        %{pcmk_release}%{?dist}
 Url:            http://www.clusterlabs.org