From fda5ce623c75e8b7ae294ad11053a4686f0fdb1f60bb23c664a63a4682b5e3ac Mon Sep 17 00:00:00 2001
From: Yan Gao <ygao@suse.com>
Date: Wed, 16 Mar 2016 17:09:40 +0000
Subject: [PATCH] Accepting request 373899 from
 home:yan_gao:branches:network:ha-clustering:Factory:Test

- pengine: Suppress assert if a stateful clone is not being demoted/stopped (bsc#971129)
- attrd: If a value of dampen is a negative number, attrd outputs warn log.
- PE: Correctly handle the ordering of demote actions for failed and moving containers
- Upstream version cs: c630c537dd51ec954482b6332662d38a6fb886e8

OBS-URL: https://build.opensuse.org/request/show/373899
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=236
---
 _service                                     | 2 +-
 pacemaker-1.1.14+git20160304.eb89393.tar.bz2 | 3 ---
 pacemaker-1.1.14+git20160315.c630c53.tar.bz2 | 3 +++
 pacemaker.changes                            | 8 ++++++++
 pacemaker.spec                               | 2 +-
 5 files changed, 13 insertions(+), 5 deletions(-)
 delete mode 100644 pacemaker-1.1.14+git20160304.eb89393.tar.bz2
 create mode 100644 pacemaker-1.1.14+git20160315.c630c53.tar.bz2

diff --git a/_service b/_service
index 4d9838e..7ea9e79 100644
--- a/_service
+++ b/_service
@@ -11,7 +11,7 @@
     <param name="version">1.1.14</param>
 -->
     <param name="versionformat">1.1.14+git%cd.%h</param>
-    <param name="revision">eb89393a82eb41ff50d041b91765ccac52e873e0</param>
+    <param name="revision">c630c537dd51ec954482b6332662d38a6fb886e8</param>
   </service>
 
   <service name="recompress" mode="disabled">
diff --git a/pacemaker-1.1.14+git20160304.eb89393.tar.bz2 b/pacemaker-1.1.14+git20160304.eb89393.tar.bz2
deleted file mode 100644
index ad69aa0..0000000
--- a/pacemaker-1.1.14+git20160304.eb89393.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:812bda6e56c997976f9c07ce585d866c2965c631e25fbcb54a8779565b9c3835
-size 3753101
diff --git a/pacemaker-1.1.14+git20160315.c630c53.tar.bz2 b/pacemaker-1.1.14+git20160315.c630c53.tar.bz2
new file mode 100644
index 0000000..d1b0fac
--- /dev/null
+++ b/pacemaker-1.1.14+git20160315.c630c53.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7ddba23abd0960c7d0ce0a1491a92277fb45aeecfe81d8ae40f03e5a828567b0
+size 3765752
diff --git a/pacemaker.changes b/pacemaker.changes
index 0d72ead..ce49158 100644
--- a/pacemaker.changes
+++ b/pacemaker.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Mar 16 12:37:41 UTC 2016 - ygao@suse.com
+
+- pengine: Suppress assert if a stateful clone is not being demoted/stopped (bsc#971129)
+- attrd: If a value of dampen is a negative number, attrd outputs warn log.
+- PE: Correctly handle the ordering of demote actions for failed and moving containers
+- Upstream version cs: c630c537dd51ec954482b6332662d38a6fb886e8
+
 -------------------------------------------------------------------
 Mon Mar  7 15:07:27 UTC 2016 - ygao@suse.com
 
diff --git a/pacemaker.spec b/pacemaker.spec
index faa6ce3..bc45713 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -110,7 +110,7 @@ License:        GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and BSD-3-Clause
 %endif
 # AGPL-3.0 licensed extra/clustermon.sh is not present in the binary
 Group:          Productivity/Clustering/HA
-Version:        1.1.14+git20160304.eb89393
+Version:        1.1.14+git20160315.c630c53
 Release:        0
 #Release:        %{pcmk_release}%{?dist}
 Url:            http://www.clusterlabs.org