diff --git a/_service b/_service
index 7a3de4d..1336dda 100644
--- a/_service
+++ b/_service
@@ -11,7 +11,7 @@
1.1.12
-->
1.1.12.git%cd.%h
- e32080b460f81486b85d08ec958582b3e72d858c
+ 3e93bc1dd6c1c3f2ee101f754567aa007b24bb5e
diff --git a/bug-806256_pacemaker-log-level-notice.patch b/bug-806256_pacemaker-log-level-notice.patch
index ce96bc7..daeafe5 100644
--- a/bug-806256_pacemaker-log-level-notice.patch
+++ b/bug-806256_pacemaker-log-level-notice.patch
@@ -8,20 +8,20 @@ Index: pacemaker/crmd/callbacks.c
===================================================================
--- pacemaker.orig/crmd/callbacks.c
+++ pacemaker/crmd/callbacks.c
-@@ -182,7 +182,7 @@ peer_update_callback(enum crm_status_typ
+@@ -204,7 +204,7 @@ peer_update_callback(enum crm_status_typ
const char *task = crm_element_value(down->xml, XML_LRM_ATTR_TASK);
if (alive && safe_str_eq(task, CRM_OP_FENCE)) {
- crm_info("Node return implies stonith of %s (action %d) completed", node->uname,
+ crm_notice("Node return implies stonith of %s (action %d) completed", node->uname,
down->id);
- erase_status_tag(node->uname, XML_CIB_TAG_LRM, cib_scope_local);
- erase_status_tag(node->uname, XML_TAG_TRANSIENT_NODEATTRS, cib_scope_local);
+
+ st_fail_count_reset(node->uname);
Index: pacemaker/crmd/membership.c
===================================================================
--- pacemaker.orig/crmd/membership.c
+++ pacemaker/crmd/membership.c
-@@ -312,7 +312,7 @@ crm_update_quorum(gboolean quorum, gbool
+@@ -430,7 +430,7 @@ crm_update_quorum(gboolean quorum, gbool
crm_xml_add(update, XML_ATTR_DC_UUID, fsa_our_uuid);
fsa_cib_update(XML_TAG_CIB, update, call_options, call_id, NULL);
@@ -47,7 +47,7 @@ Index: pacemaker/fencing/remote.c
===================================================================
--- pacemaker.orig/fencing/remote.c
+++ pacemaker/fencing/remote.c
-@@ -345,7 +345,7 @@ remote_op_timeout(gpointer userdata)
+@@ -374,7 +374,7 @@ remote_op_timeout(gpointer userdata)
return FALSE;
}
@@ -55,4 +55,4 @@ Index: pacemaker/fencing/remote.c
+ crm_notice("Action %s (%s) for %s (%s) timed out",
op->action, op->id, op->target, op->client_name);
op->state = st_failed;
-
+
diff --git a/pacemaker-1.1.12.git20150313.e32080b.tar.bz2 b/pacemaker-1.1.12.git20150313.e32080b.tar.bz2
deleted file mode 100644
index b787438..0000000
--- a/pacemaker-1.1.12.git20150313.e32080b.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a95672698193dd9d8b51b2c0220d1755c5634c0984d5f9e133cea0a98cf62633
-size 9441027
diff --git a/pacemaker-1.1.12.git20150326.3e93bc1.tar.bz2 b/pacemaker-1.1.12.git20150326.3e93bc1.tar.bz2
new file mode 100644
index 0000000..0af82d9
--- /dev/null
+++ b/pacemaker-1.1.12.git20150326.3e93bc1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bb261c04ef0c746ca0f690856d9bdd23374d50accc938d08805df2176f64ff60
+size 9567712
diff --git a/pacemaker-NodeUtilization-RA.patch b/pacemaker-NodeUtilization-RA.patch
index 2395d35..b0ea547 100644
--- a/pacemaker-NodeUtilization-RA.patch
+++ b/pacemaker-NodeUtilization-RA.patch
@@ -8,7 +8,7 @@ Index: pacemaker/extra/resources/Makefile.am
===================================================================
--- pacemaker.orig/extra/resources/Makefile.am
+++ pacemaker/extra/resources/Makefile.am
-@@ -33,7 +33,8 @@ ocf_SCRIPTS = ClusterMon \
+@@ -37,7 +37,8 @@ ocf_SCRIPTS = ClusterMon \
Stateful \
SysInfo \
SystemHealth \
@@ -16,8 +16,8 @@ Index: pacemaker/extra/resources/Makefile.am
+ remote \
+ NodeUtilization
- if BUILD_XML_HELP
-
+ containertech_SCRIPTS = docker-wrapper
+
Index: pacemaker/extra/resources/NodeUtilization
===================================================================
--- /dev/null
diff --git a/pacemaker-colocated-utilization.patch b/pacemaker-colocated-utilization.patch
index 2bacf7b..3aa8161 100644
--- a/pacemaker-colocated-utilization.patch
+++ b/pacemaker-colocated-utilization.patch
@@ -321,7 +321,7 @@ Index: pacemaker/pengine/native.c
constraint->score >= 0 ? "" : "Anti-",
rsc_lh->id, rsc_rh->id, constraint->id, constraint->score, filter_results);
@@ -3307,3 +3447,86 @@ native_append_meta(resource_t * rsc, xml
- free(name);
+ break;
}
}
+
diff --git a/pacemaker.changes b/pacemaker.changes
index 0102fc2..06888d6 100644
--- a/pacemaker.changes
+++ b/pacemaker.changes
@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Fri Mar 27 15:09:25 UTC 2015 - ygao@suse.com
+
+- Rebase:
+ * bug-806256_pacemaker-log-level-notice.patch
+ * pacemaker-NodeUtilization-RA.patch
+ * pacemaker-colocated-utilization.patch
+
+- crmd: All peers need to track node shutdown requests (bsc#917625)
+- crmd: Cached copies of transient attributes cease to be valid once a node leaves the membership (bsc#917625)
+- crmd: Wait for all pending operations to complete before poking the policy engine
+- lrmd: preserve exit reason string when isolation wrappers are in use
+- docker-wrapper: properly separate docker and resource specific attributes
+- docker-wrapper: set authkey file permissions and properly set container 'node name' during start
+- systemd: Trick systemd into not stopping our services before us during shutdown
+- mcp: Allow a configurable delay when debugging shutdown issues
+- systemd: Kindly ask dbus NOT to kill the process if the dbus connection fails
+- systemd: Tell systemd not to take DBus down from underneath us
+- cib: Correctly set up signal handlers
+- PE: Do not record duplicate copies of the failed actions
+- lrmd: enable ipc proxy for docker-wrapper privileged mode
+- lrmd: properly handle poke requests in lrmd client when using ipc
+- spec: add docker-wrapper directory to spec file
+- pengine: disable migrations for resources with isolation containers
+- pengine: disable reloading of resources within isolated container wrappers
+- pengine: ability to launch resources in isolated containers
+- extra: docker container tech wrapper script for pcmk remote
+- tools: crm_mon prints Stopped clones only if --inactive was specified
+- tools: display node names more consistently in crm_mon output
+- tools: Improve crm_mon output with certain option combinations
+- tools: make crm_mon last updated header consistent across formats
+- remote: pcmk remote client tool for use with container wrapper script
+- crmd: Reset stonith failcount to recover transitioner when the node rejoins (bsc#921102)
+- systemd: fix crash caused when canceling in-flight operation
+- Upstream version cs: 3e93bc1dd6c1c3f2ee101f754567aa007b24bb5e
+
-------------------------------------------------------------------
Fri Mar 13 09:38:52 UTC 2015 - ygao@suse.com
diff --git a/pacemaker.spec b/pacemaker.spec
index 4ac9b50..a8b38b6 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.git20150313.e32080b
+Version: 1.1.12.git20150326.3e93bc1
Release: 0
#Release: %{pcmk_release}%{?dist}
Url: http://www.clusterlabs.org