From 1121ca4657ee5aa73e0aba878bcc18f96f2bce0a97bb29d1a3a79b7468c52c69 Mon Sep 17 00:00:00 2001
From: Yan Gao <ygao@suse.com>
Date: Fri, 5 Sep 2014 07:37:24 +0000
Subject: [PATCH] - cluster: Invoke crm_remove_conflicting_peer() only when the
 new node's uname is being assigned in the node cache (bnc#870771) - mcp: set
 environment variable which the cluster-glue module needs - services: Refector
 services os execute function - Upstream version cs:
 266d5c2484716111616bcd0f32d9b94bc49baa77

OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=162
---
 _service                                     | 2 +-
 pacemaker-1.1.12.git20140825.362f181.tar.bz2 | 3 ---
 pacemaker-1.1.12.git20140904.266d5c2.tar.bz2 | 3 +++
 pacemaker.changes                            | 8 ++++++++
 pacemaker.spec                               | 2 +-
 5 files changed, 13 insertions(+), 5 deletions(-)
 delete mode 100644 pacemaker-1.1.12.git20140825.362f181.tar.bz2
 create mode 100644 pacemaker-1.1.12.git20140904.266d5c2.tar.bz2

diff --git a/_service b/_service
index 05c3f85..f756a56 100644
--- a/_service
+++ b/_service
@@ -11,7 +11,7 @@
     <param name="version">1.1.12</param>
 -->
     <param name="versionformat">1.1.12.git%cd.%h</param>
-    <param name="revision">dad4cebccdb5a4bcdb8fb94e676f6df006ac0846</param>
+    <param name="revision">266d5c2484716111616bcd0f32d9b94bc49baa77</param>
   </service>
 
   <service name="recompress" mode="disabled">
diff --git a/pacemaker-1.1.12.git20140825.362f181.tar.bz2 b/pacemaker-1.1.12.git20140825.362f181.tar.bz2
deleted file mode 100644
index 9c38b8a..0000000
--- a/pacemaker-1.1.12.git20140825.362f181.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5b2857de3a3eef5ee994f8008e7af1334f1c51f0f28780ac0fb856a29ca89452
-size 9331789
diff --git a/pacemaker-1.1.12.git20140904.266d5c2.tar.bz2 b/pacemaker-1.1.12.git20140904.266d5c2.tar.bz2
new file mode 100644
index 0000000..80ed757
--- /dev/null
+++ b/pacemaker-1.1.12.git20140904.266d5c2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:df8d3df106f75ed4d58196bd1b0813bc1cc86977df0b21ee59c1c2cb8044dbf2
+size 9332595
diff --git a/pacemaker.changes b/pacemaker.changes
index 782500b..54ca144 100644
--- a/pacemaker.changes
+++ b/pacemaker.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Sep  5 07:33:50 UTC 2014 - ygao@suse.com
+
+- cluster: Invoke crm_remove_conflicting_peer() only when the new node's uname is being assigned in the node cache (bnc#870771)
+- mcp: set environment variable which the cluster-glue module needs
+- services: Refector services os execute function
+- Upstream version cs: 266d5c2484716111616bcd0f32d9b94bc49baa77
+
 -------------------------------------------------------------------
 Wed Aug 27 11:27:38 UTC 2014 - ygao@suse.com
 
diff --git a/pacemaker.spec b/pacemaker.spec
index fbbe99b..6236d60 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.git20140825.362f181
+Version:        1.1.12.git20140904.266d5c2
 Release:        0
 #Release:        %{pcmk_release}%{?dist}
 Url:            http://www.clusterlabs.org