From 88cda577638f0c0fce63b6884ef762169bd2e1685c7babc38e9de8c1fe65d8d1 Mon Sep 17 00:00:00 2001
From: Yan Gao <ygao@suse.com>
Date: Fri, 21 Nov 2014 15:41:23 +0000
Subject: [PATCH] - crm_node: Correctly remove nodes from the CIB by nodeid -
 fencing: Allow nodes to be purged from the member cache - xml: cl#5231 -
 Unset the deleted attributes in the resulting diffs (bsc#905641) - fencing:
 stonith -l option for custom log - cib: Avoid nodeid conflicts we don't care
 about - Membership: Detect and resolve nodes that change their ID - attrd:
 Simplify how node deletions happen - attrd: Clean out the node cache when
 requested by the admin - crm_resource: Allow resource restart operations to
 be node specific - crm_resource: Implement --timeout for resource restart
 operations - crm_resource: Calculate how long to wait for a restart based on
 the resource timeouts - crm_resource: Implement an intelligent restart
 capability - crm_failcount: Better error reporting when no resource is
 specified - cib: tls sock cleanup for remote cib connections - Upstream
 version cs: 7dd90226e10035340d6707d9fd2b04f2e0141194

OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=174
---
 _service                                     |  4 ++--
 pacemaker-1.1.12.git20141113.5093c09.tar.bz2 |  3 ---
 pacemaker-1.1.12.git20141118.7dd9022.tar.bz2 |  3 +++
 pacemaker.changes                            | 19 +++++++++++++++++++
 pacemaker.spec                               |  2 +-
 5 files changed, 25 insertions(+), 6 deletions(-)
 delete mode 100644 pacemaker-1.1.12.git20141113.5093c09.tar.bz2
 create mode 100644 pacemaker-1.1.12.git20141118.7dd9022.tar.bz2

diff --git a/_service b/_service
index d90267a..54d5a3d 100644
--- a/_service
+++ b/_service
@@ -2,7 +2,7 @@
   <service name="tar_scm" mode="disabled">
     <param name="scm">git</param>
     <param name="url">git://github.com/ClusterLabs/pacemaker.git</param>
-    <param name="package-meta">yes</param>
+    <param name="package-meta">no</param>
     <param name="exclude">.git</param>
 <!--
     To update to a new release, change "revision" to the desired
@@ -11,7 +11,7 @@
     <param name="version">1.1.12</param>
 -->
     <param name="versionformat">1.1.12.git%cd.%h</param>
-    <param name="revision">5093c095c5f517ab58375b2b69ecfc5516c86b5b</param>
+    <param name="revision">7dd90226e10035340d6707d9fd2b04f2e0141194</param>
   </service>
 
   <service name="recompress" mode="disabled">
diff --git a/pacemaker-1.1.12.git20141113.5093c09.tar.bz2 b/pacemaker-1.1.12.git20141113.5093c09.tar.bz2
deleted file mode 100644
index 07f0b50..0000000
--- a/pacemaker-1.1.12.git20141113.5093c09.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0f4b68455a9f031c80e2227604bc7dde173f7d4836a8698fa3394f163eb11384
-size 145209095
diff --git a/pacemaker-1.1.12.git20141118.7dd9022.tar.bz2 b/pacemaker-1.1.12.git20141118.7dd9022.tar.bz2
new file mode 100644
index 0000000..dcd1370
--- /dev/null
+++ b/pacemaker-1.1.12.git20141118.7dd9022.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ba3347698c14c1b25f17cc477218ccba3d86bcf41e709c4036e047899fad821a
+size 9445997
diff --git a/pacemaker.changes b/pacemaker.changes
index fa581b6..c29e0a6 100644
--- a/pacemaker.changes
+++ b/pacemaker.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Fri Nov 21 15:38:57 UTC 2014 - ygao@suse.com
+
+- crm_node: Correctly remove nodes from the CIB by nodeid
+- fencing: Allow nodes to be purged from the member cache
+- xml: cl#5231 - Unset the deleted attributes in the resulting diffs (bsc#905641)
+- fencing: stonith -l option for custom log
+- cib: Avoid nodeid conflicts we don't care about
+- Membership: Detect and resolve nodes that change their ID
+- attrd: Simplify how node deletions happen
+- attrd: Clean out the node cache when requested by the admin
+- crm_resource: Allow resource restart operations to be node specific
+- crm_resource: Implement --timeout for resource restart operations
+- crm_resource: Calculate how long to wait for a restart based on the resource timeouts
+- crm_resource: Implement an intelligent restart capability
+- crm_failcount: Better error reporting when no resource is specified
+- cib: tls sock cleanup for remote cib connections
+- Upstream version cs: 7dd90226e10035340d6707d9fd2b04f2e0141194
+
 -------------------------------------------------------------------
 Fri Nov 14 09:44:03 UTC 2014 - ygao@suse.com
 
diff --git a/pacemaker.spec b/pacemaker.spec
index 679bea2..d92fd75 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.git20141113.5093c09
+Version:        1.1.12.git20141118.7dd9022
 Release:        0
 #Release:        %{pcmk_release}%{?dist}
 Url:            http://www.clusterlabs.org