From bce0e871296fe3c1b996601ee84449fd905526e0f4a0f39b0878b0facffb8917 Mon Sep 17 00:00:00 2001
From: Yan Gao <ygao@suse.com>
Date: Thu, 10 Jul 2014 10:06:42 +0000
Subject: [PATCH] - systemd: Ensure the retry logic is also exercised for the
 'service' class - crm_simulate: Remove resource states and transient
 attributes when a node is marked as down - crm_verify: Perform a full set of
 calculations whenever the status section is present (bnc#886479) - PE:
 Correctly warn when resources require fencing but fencing is disabled
 (bnc#886479) - PE: Always use pe_fence_node to mark nodes as unclean - lrmd:
 Handle systemd reporting 'done' before a resource is actually stopped -
 Upstream version cs: c468fa06483152c29529f81aa0b5ccf37da8b2af

OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=150
---
 _service                                     |  2 +-
 pacemaker-1.1.11+git20140703.440da7f.tar.bz2 |  3 ---
 pacemaker-1.1.11+git20140710.c468fa0.tar.bz2 |  3 +++
 pacemaker.changes                            | 11 +++++++++++
 pacemaker.spec                               |  2 +-
 5 files changed, 16 insertions(+), 5 deletions(-)
 delete mode 100644 pacemaker-1.1.11+git20140703.440da7f.tar.bz2
 create mode 100644 pacemaker-1.1.11+git20140710.c468fa0.tar.bz2

diff --git a/_service b/_service
index f25f5c0..d13dbbf 100644
--- a/_service
+++ b/_service
@@ -11,7 +11,7 @@
     <param name="version">1.1.11</param>
 -->
     <param name="versionformat">1.1.11+git%cd.%h</param>
-    <param name="revision">440da7f59ac4bed16a0289e33f04d2635b335c70</param>
+    <param name="revision">c468fa06483152c29529f81aa0b5ccf37da8b2af</param>
   </service>
 
   <service name="recompress" mode="disabled">
diff --git a/pacemaker-1.1.11+git20140703.440da7f.tar.bz2 b/pacemaker-1.1.11+git20140703.440da7f.tar.bz2
deleted file mode 100644
index d09cd3c..0000000
--- a/pacemaker-1.1.11+git20140703.440da7f.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b190a27afc3c677845e40c4da95bdc260b66822159ed37b4bf5c34680323302b
-size 9324783
diff --git a/pacemaker-1.1.11+git20140710.c468fa0.tar.bz2 b/pacemaker-1.1.11+git20140710.c468fa0.tar.bz2
new file mode 100644
index 0000000..9de35db
--- /dev/null
+++ b/pacemaker-1.1.11+git20140710.c468fa0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3811bdaf7481410084e4e88c576946c1461a93f468f3a2e720b44f5d5c0f741c
+size 9323362
diff --git a/pacemaker.changes b/pacemaker.changes
index 51cfc0d..3c7bdc6 100644
--- a/pacemaker.changes
+++ b/pacemaker.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Jul 10 10:02:09 UTC 2014 - ygao@suse.com
+
+- systemd: Ensure the retry logic is also exercised for the 'service' class
+- crm_simulate: Remove resource states and transient attributes when a node is marked as down
+- crm_verify: Perform a full set of calculations whenever the status section is present (bnc#886479)
+- PE: Correctly warn when resources require fencing but fencing is disabled (bnc#886479)
+- PE: Always use pe_fence_node to mark nodes as unclean
+- lrmd: Handle systemd reporting 'done' before a resource is actually stopped
+- Upstream version cs: c468fa06483152c29529f81aa0b5ccf37da8b2af
+
 -------------------------------------------------------------------
 Thu Jul  3 05:41:16 UTC 2014 - ygao@suse.com
 
diff --git a/pacemaker.spec b/pacemaker.spec
index d5fe1fc..db3a0a7 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.11+git20140703.440da7f
+Version:        1.1.11+git20140710.c468fa0
 Release:        0
 #Release:        %{pcmk_release}%{?dist}
 Url:            http://www.clusterlabs.org