From 29b8fc441bfe9296da85e522613ca55c55670deeacaae8b9887e2ce91ee52aa9 Mon Sep 17 00:00:00 2001
From: Yan Gao <ygao@suse.com>
Date: Wed, 27 Aug 2014 11:31:22 +0000
Subject: [PATCH] - logging: correctly initialized default log file
 (bnc#883567) - Upstream version cs: 362f181a387e0a0a9f04e0da84d6c5906d71dd20
 - services: Remove cancelled recurring ops from internal lists as early as
 possible (bnc#888586) - services: Remove file descriptors from mainloop as
 soon as we have drained them (bnc#888586)

OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=160
---
 pacemaker-1.1.12.git20140818.dad4ceb.tar.bz2 |  3 ---
 pacemaker-1.1.12.git20140825.362f181.tar.bz2 |  3 +++
 pacemaker.changes                            | 10 ++++++++--
 pacemaker.spec                               |  2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)
 delete mode 100644 pacemaker-1.1.12.git20140818.dad4ceb.tar.bz2
 create mode 100644 pacemaker-1.1.12.git20140825.362f181.tar.bz2

diff --git a/pacemaker-1.1.12.git20140818.dad4ceb.tar.bz2 b/pacemaker-1.1.12.git20140818.dad4ceb.tar.bz2
deleted file mode 100644
index 48d83fe..0000000
--- a/pacemaker-1.1.12.git20140818.dad4ceb.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a0d6012ac7b3495a808d642cefd5863958ebe78148d57d7898d25ad1b08cbfe2
-size 9330699
diff --git a/pacemaker-1.1.12.git20140825.362f181.tar.bz2 b/pacemaker-1.1.12.git20140825.362f181.tar.bz2
new file mode 100644
index 0000000..9c38b8a
--- /dev/null
+++ b/pacemaker-1.1.12.git20140825.362f181.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5b2857de3a3eef5ee994f8008e7af1334f1c51f0f28780ac0fb856a29ca89452
+size 9331789
diff --git a/pacemaker.changes b/pacemaker.changes
index dcd6f8e..782500b 100644
--- a/pacemaker.changes
+++ b/pacemaker.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Aug 27 11:27:38 UTC 2014 - ygao@suse.com
+
+- logging: correctly initialized default log file (bnc#883567)
+- Upstream version cs: 362f181a387e0a0a9f04e0da84d6c5906d71dd20
+
 -------------------------------------------------------------------
 Mon Aug 18 08:02:31 UTC 2014 - ygao@suse.com
 
@@ -114,8 +120,8 @@ Wed Jun 11 05:44:21 UTC 2014 - ygao@suse.com
 - Fencing: Cache metadata lookups to avoid repeated blocking during device registration
 - pengine: properly place resource within a container when container is a remote-node.
 - mainloop: Better handle the killing of processes in the act of exiting
-- services: Remove cancelled recurring ops from internal lists as early as possible
-- services: Remove file descriptors from mainloop as soon as we have drained them
+- services: Remove cancelled recurring ops from internal lists as early as possible (bnc#888586)
+- services: Remove file descriptors from mainloop as soon as we have drained them (bnc#888586)
 - pengine: Don't report a resource as restarting when it is a moving multistate resource
 - pengine: avoid assert by searching for stop action on correct node during LogActions
 - Upstream version cs: 734e6b538b0a037f9e7d0709f450bd664f26c332
diff --git a/pacemaker.spec b/pacemaker.spec
index 89dada0..fbbe99b 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.git20140818.dad4ceb
+Version:        1.1.12.git20140825.362f181
 Release:        0
 #Release:        %{pcmk_release}%{?dist}
 Url:            http://www.clusterlabs.org