From 164af431389cbc4fb35debda8c72f5064afc3d708c1a326c869df7dca7571bf9 Mon Sep 17 00:00:00 2001
From: Yan Gao <ygao@suse.com>
Date: Mon, 28 Jul 2014 06:24:15 +0000
Subject: [PATCH] - Bug rhbz#1067544 - Tools: Correctly handle --ban, --move
 and --locate for master/slave groups - lrmd: Log with the correct personality
 - mainloop: implement gio_poll_dispatch_mod - Upstream version cs:
 483f48a1921241f1f5976a100a171785dc327192

OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=157
---
 _service                                     | 2 +-
 pacemaker-1.1.12+git20140722.561c4cf.tar.bz2 | 3 ---
 pacemaker-1.1.12+git20140723.483f48a.tar.bz2 | 3 +++
 pacemaker.changes                            | 8 ++++++++
 pacemaker.spec                               | 2 +-
 5 files changed, 13 insertions(+), 5 deletions(-)
 delete mode 100644 pacemaker-1.1.12+git20140722.561c4cf.tar.bz2
 create mode 100644 pacemaker-1.1.12+git20140723.483f48a.tar.bz2

diff --git a/_service b/_service
index b025077..8d2ed5b 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">561c4cfda1b09b31b60fd5f73644ee05348f41fb</param>
+    <param name="revision">483f48a1921241f1f5976a100a171785dc327192</param>
   </service>
 
   <service name="recompress" mode="disabled">
diff --git a/pacemaker-1.1.12+git20140722.561c4cf.tar.bz2 b/pacemaker-1.1.12+git20140722.561c4cf.tar.bz2
deleted file mode 100644
index e839f84..0000000
--- a/pacemaker-1.1.12+git20140722.561c4cf.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:31eb91699ecf5b477ca8f41072fddac16a1cd2cf2aab46f4ade2772844649970
-size 9327266
diff --git a/pacemaker-1.1.12+git20140723.483f48a.tar.bz2 b/pacemaker-1.1.12+git20140723.483f48a.tar.bz2
new file mode 100644
index 0000000..1a7bf8e
--- /dev/null
+++ b/pacemaker-1.1.12+git20140723.483f48a.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4d35fb39d6b09618c7155554a775dde60e9be632605894d532c0d04ae0545a58
+size 9329855
diff --git a/pacemaker.changes b/pacemaker.changes
index 32dd43e..95d0a38 100644
--- a/pacemaker.changes
+++ b/pacemaker.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jul 28 05:26:26 UTC 2014 - ygao@suse.com
+
+- Bug rhbz#1067544 - Tools: Correctly handle --ban, --move and --locate for master/slave groups
+- lrmd: Log with the correct personality
+- mainloop: implement gio_poll_dispatch_mod
+- Upstream version cs: 483f48a1921241f1f5976a100a171785dc327192
+
 -------------------------------------------------------------------
 Tue Jul 22 05:10:09 UTC 2014 - ygao@suse.com
 
diff --git a/pacemaker.spec b/pacemaker.spec
index 0b32cad..bad7462 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+git20140722.561c4cf
+Version:        1.1.12+git20140723.483f48a
 Release:        0
 #Release:        %{pcmk_release}%{?dist}
 Url:            http://www.clusterlabs.org