From 1d3264062810466d77f45dfd43148f12608212c19eaabf3997d428844732d5c3 Mon Sep 17 00:00:00 2001
From: Yan Gao <ygao@suse.com>
Date: Wed, 16 Apr 2014 09:04:09 +0000
Subject: [PATCH] - pengine: Fix memory leak in expand_tags_in_sets() - PE:
 Memory leak - PE: Do not initiate fencing for unclean nodes when fencing is
 disabled - crm_node: Only remove the named resource from the cib - pengine:
 Support site-specific instance attributes based on rules (FATE#316118) -
 pengine: Ignore failure-timeout only if the failed operation has
 on-fail="block" (bnc#871175) - Upstream version cs:
 f7859e2e06c8cf320482c3e4b447ddbe0a96fe83

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

diff --git a/_service b/_service
index 7dd7d97..571ea61 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">3f7ec44b51825898e3e30784ca4df09e3f45bf40</param>
+    <param name="revision">f7859e2e06c8cf320482c3e4b447ddbe0a96fe83</param>
   </service>
 
   <service name="recompress" mode="disabled">
diff --git a/pacemaker-1.1.11+git20140414.3f7ec44.tar.bz2 b/pacemaker-1.1.11+git20140414.3f7ec44.tar.bz2
deleted file mode 100644
index 5cc6ca9..0000000
--- a/pacemaker-1.1.11+git20140414.3f7ec44.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1dc89abe750fd6c365296124162ded184fb6dde656d2717bde667af2d175733f
-size 9439763
diff --git a/pacemaker-1.1.11+git20140415.f7859e2.tar.bz2 b/pacemaker-1.1.11+git20140415.f7859e2.tar.bz2
new file mode 100644
index 0000000..3b6a214
--- /dev/null
+++ b/pacemaker-1.1.11+git20140415.f7859e2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:78e6d134ff2750aaa91bb4551add0344f094bea8a5c738bd562dca21663e1cff
+size 9422160
diff --git a/pacemaker.changes b/pacemaker.changes
index 2103d01..c6ff69e 100644
--- a/pacemaker.changes
+++ b/pacemaker.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Apr 16 06:38:45 UTC 2014 - ygao@suse.com
+
+- pengine: Fix memory leak in expand_tags_in_sets()
+- PE: Memory leak
+- PE: Do not initiate fencing for unclean nodes when fencing is disabled
+- crm_node: Only remove the named resource from the cib
+- pengine: Support site-specific instance attributes based on rules (FATE#316118)
+- pengine: Ignore failure-timeout only if the failed operation has on-fail="block" (bnc#871175)
+- Upstream version cs: f7859e2e06c8cf320482c3e4b447ddbe0a96fe83
+
 -------------------------------------------------------------------
 Mon Apr 14 06:10:25 UTC 2014 - ygao@suse.com
 
diff --git a/pacemaker.spec b/pacemaker.spec
index 26f7006..2f4ab80 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -95,7 +95,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+git20140414.3f7ec44
+Version:        1.1.11+git20140415.f7859e2
 Release:        0
 #Release:        %{pcmk_release}%{?dist}
 Url:            http://www.clusterlabs.org