From 56d2274c387d2fbedead59463c215afd4352a7d222b0780bbba4941b2a13f66d Mon Sep 17 00:00:00 2001
From: Yan Gao <ygao@suse.com>
Date: Fri, 13 Jun 2014 09:01:28 +0000
Subject: [PATCH] - Bug cl#5219 - PE: Allow unrelated resources with a common
 colocation target to remain promoted - Upstream version cs:
 97629ded958f76652350569a54303b3cd25d1d7e

OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=144
---
 _service                                     | 2 +-
 pacemaker-1.1.11+git20140613.4f00ccc.tar.bz2 | 3 ---
 pacemaker-1.1.11+git20140613.97629de.tar.bz2 | 3 +++
 pacemaker.changes                            | 3 ++-
 pacemaker.spec                               | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 100644 pacemaker-1.1.11+git20140613.4f00ccc.tar.bz2
 create mode 100644 pacemaker-1.1.11+git20140613.97629de.tar.bz2

diff --git a/_service b/_service
index f69c06c..24e9012 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">4f00ccce11db182afa88c90ddfe444f319ccfe3a</param>
+    <param name="revision">97629ded958f76652350569a54303b3cd25d1d7e</param>
   </service>
 
   <service name="recompress" mode="disabled">
diff --git a/pacemaker-1.1.11+git20140613.4f00ccc.tar.bz2 b/pacemaker-1.1.11+git20140613.4f00ccc.tar.bz2
deleted file mode 100644
index 78737c5..0000000
--- a/pacemaker-1.1.11+git20140613.4f00ccc.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:75c877718aa8dac34ac787264a14debfdd33115e8cc601de562cb34c0aa015dc
-size 9320750
diff --git a/pacemaker-1.1.11+git20140613.97629de.tar.bz2 b/pacemaker-1.1.11+git20140613.97629de.tar.bz2
new file mode 100644
index 0000000..5eac8b6
--- /dev/null
+++ b/pacemaker-1.1.11+git20140613.97629de.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fb27e89681d36c92974e2d9594d7d3c84e7753db0102d26ed6c7853e18ab3ccb
+size 9321002
diff --git a/pacemaker.changes b/pacemaker.changes
index d21120c..621c607 100644
--- a/pacemaker.changes
+++ b/pacemaker.changes
@@ -1,11 +1,12 @@
 -------------------------------------------------------------------
 Fri Jun 13 03:16:29 UTC 2014 - ygao@suse.com
 
+- Bug cl#5219 - PE: Allow unrelated resources with a common colocation target to remain promoted
 - Bug cl#5222 - Enable legacy mode whenever a broadcast update is detected (bnc#881575)
 - xml: Prevent incorrect xml diffs from corrupting the cib (bnc#878362)
 - mainloop: implement gio_poll_dispatch_mod
 - cluster: Prevent search of unames from attempting to create node entries for unknown nodes (bnc#881884)
-- Upstream version cs: 4f00ccce11db182afa88c90ddfe444f319ccfe3a
+- Upstream version cs: 97629ded958f76652350569a54303b3cd25d1d7e
 
 -------------------------------------------------------------------
 Wed Jun 11 05:44:21 UTC 2014 - ygao@suse.com
diff --git a/pacemaker.spec b/pacemaker.spec
index ae19040..482bb1a 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.11+git20140613.4f00ccc
+Version:        1.1.11+git20140613.97629de
 Release:        0
 #Release:        %{pcmk_release}%{?dist}
 Url:            http://www.clusterlabs.org