From 969abc3b95b1c8cfdb6d57e9ffece56c8094a117d36f4543225bfaed2fc96b48 Mon Sep 17 00:00:00 2001
From: Yan Gao <ygao@suse.com>
Date: Mon, 18 Aug 2014 08:57:27 +0000
Subject: [PATCH] - crm_resource: Print a clear message if the attribute is not
 found for the resource (bnc#890400) - lrmd: fix rescheduling of systemd
 monitor op during start - services: restore SIGPIPE default behavior for
 child processes - lrmd: prevent \n from being printed in exit reason output -
 lrmd: pass exit reason prefix to ocf scripts as env variable - Upstream
 version cs: dad4cebccdb5a4bcdb8fb94e676f6df006ac0846

- crm_diff: Support generating a difference without versions details if --no-version/-u is supplied (bnc#888726)
- crmd: When container's host is fenced, cancel in-flight operations
- crm_mon: add exit reason to resource failure output
- lrmd: store failed operation exit reason in cib
- Upstream version cs: 1040002ecc1a0dfec9f0561f79936cbe64d716db

OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=159
---
 _service                                     |  4 ++--
 pacemaker-1.1.12+git20140723.483f48a.tar.bz2 |  3 ---
 pacemaker-1.1.12.git20140818.dad4ceb.tar.bz2 |  3 +++
 pacemaker.changes                            | 19 +++++++++++++++++++
 pacemaker.spec                               |  2 +-
 5 files changed, 25 insertions(+), 6 deletions(-)
 delete mode 100644 pacemaker-1.1.12+git20140723.483f48a.tar.bz2
 create mode 100644 pacemaker-1.1.12.git20140818.dad4ceb.tar.bz2

diff --git a/_service b/_service
index 8d2ed5b..05c3f85 100644
--- a/_service
+++ b/_service
@@ -10,8 +10,8 @@
 
     <param name="version">1.1.12</param>
 -->
-    <param name="versionformat">1.1.12+git%cd.%h</param>
-    <param name="revision">483f48a1921241f1f5976a100a171785dc327192</param>
+    <param name="versionformat">1.1.12.git%cd.%h</param>
+    <param name="revision">dad4cebccdb5a4bcdb8fb94e676f6df006ac0846</param>
   </service>
 
   <service name="recompress" mode="disabled">
diff --git a/pacemaker-1.1.12+git20140723.483f48a.tar.bz2 b/pacemaker-1.1.12+git20140723.483f48a.tar.bz2
deleted file mode 100644
index 1a7bf8e..0000000
--- a/pacemaker-1.1.12+git20140723.483f48a.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4d35fb39d6b09618c7155554a775dde60e9be632605894d532c0d04ae0545a58
-size 9329855
diff --git a/pacemaker-1.1.12.git20140818.dad4ceb.tar.bz2 b/pacemaker-1.1.12.git20140818.dad4ceb.tar.bz2
new file mode 100644
index 0000000..48d83fe
--- /dev/null
+++ b/pacemaker-1.1.12.git20140818.dad4ceb.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a0d6012ac7b3495a808d642cefd5863958ebe78148d57d7898d25ad1b08cbfe2
+size 9330699
diff --git a/pacemaker.changes b/pacemaker.changes
index 95d0a38..dcd6f8e 100644
--- a/pacemaker.changes
+++ b/pacemaker.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Mon Aug 18 08:02:31 UTC 2014 - ygao@suse.com
+
+- crm_resource: Print a clear message if the attribute is not found for the resource (bnc#890400)
+- lrmd: fix rescheduling of systemd monitor op during start
+- services: restore SIGPIPE default behavior for child processes
+- lrmd: prevent \n from being printed in exit reason output
+- lrmd: pass exit reason prefix to ocf scripts as env variable
+- Upstream version cs: dad4cebccdb5a4bcdb8fb94e676f6df006ac0846
+
+-------------------------------------------------------------------
+Thu Aug  7 06:47:29 UTC 2014 - ygao@suse.com
+
+- crm_diff: Support generating a difference without versions details if --no-version/-u is supplied (bnc#888726)
+- crmd: When container's host is fenced, cancel in-flight operations
+- crm_mon: add exit reason to resource failure output
+- lrmd: store failed operation exit reason in cib
+- Upstream version cs: 1040002ecc1a0dfec9f0561f79936cbe64d716db
+
 -------------------------------------------------------------------
 Mon Jul 28 05:26:26 UTC 2014 - ygao@suse.com
 
diff --git a/pacemaker.spec b/pacemaker.spec
index bad7462..89dada0 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+git20140723.483f48a
+Version:        1.1.12.git20140818.dad4ceb
 Release:        0
 #Release:        %{pcmk_release}%{?dist}
 Url:            http://www.clusterlabs.org