diff --git a/_service b/_service
index 7a0a8b3..4d9838e 100644
--- a/_service
+++ b/_service
@@ -11,7 +11,7 @@
<param name="version">1.1.14</param>
-->
<param name="versionformat">1.1.14+git%cd.%h</param>
- <param name="revision">cf67796823c4429714857411e614cfacfbc59d89</param>
+ <param name="revision">eb89393a82eb41ff50d041b91765ccac52e873e0</param>
</service>
<service name="recompress" mode="disabled">
diff --git a/pacemaker-1.1.14+git20160229.cf67796.tar.bz2 b/pacemaker-1.1.14+git20160229.cf67796.tar.bz2
deleted file mode 100644
index 959e927..0000000
--- a/pacemaker-1.1.14+git20160229.cf67796.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a028839fdcc69a515b48146d700304b108bfedb81301040a6c450be583d5c3de
-size 3742417
diff --git a/pacemaker-1.1.14+git20160304.eb89393.tar.bz2 b/pacemaker-1.1.14+git20160304.eb89393.tar.bz2
new file mode 100644
index 0000000..ad69aa0
--- /dev/null
+++ b/pacemaker-1.1.14+git20160304.eb89393.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:812bda6e56c997976f9c07ce585d866c2965c631e25fbcb54a8779565b9c3835
+size 3753101
diff --git a/pacemaker.changes b/pacemaker.changes
index f92bc9a..0d72ead 100644
--- a/pacemaker.changes
+++ b/pacemaker.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Mar 7 15:07:27 UTC 2016 - ygao@suse.com
+
+- crmd,tools: Set attributes for remote nodes directly into cib if it's legacy attrd (bsc#967775)
+- libcib: Correctly determine the node type (bsc#967775)
+- resources: match agents' default for globally_unique to pacemaker's
+- crm_mon: Help admins identify why resources are not being started or responding to commands
+- PE: Memory leak
+- crm_resource: Prevent segfault when --resource is not correctly supplied for --restart command
+- Build: Create CRM_CORE_DIR during installation
+- Upstream version cs: eb89393a82eb41ff50d041b91765ccac52e873e0
+
-------------------------------------------------------------------
Mon Feb 29 11:53:36 UTC 2016 - ygao@suse.com
@@ -207,10 +219,10 @@ Thu Oct 8 10:29:54 UTC 2015 - ygao@suse.com
- Fencing: Correctly construct simple topologies with stonith_admin
- Fencing: Correctly remove topologies and detect invalid entries
-- remote: Revise a misleading message in the ocf:pacemaker:remote resource agent (bsc#946332)
+- remote: Revise a misleading message in the ocf:pacemaker:remote resource agent (bsc#946332, bsc#967383)
* Drop bug-946332_pacemaker-resource-agent-remote-message.patch which has been merged upstream
-- remote: Correctly display the usage of the ocf:pacemaker:remote resource agent (bsc#946332)
+- remote: Correctly display the usage of the ocf:pacemaker:remote resource agent (bsc#946332, bsc#967383)
* Drop bug-946332_pacemaker-resource-agent-remote-usage.patch which has been merged upstream
- libcib: find_nvpair_attr_delegate: check buffer overflow
@@ -220,10 +232,10 @@ Thu Oct 8 10:29:54 UTC 2015 - ygao@suse.com
-------------------------------------------------------------------
Fri Sep 18 08:22:19 UTC 2015 - ygao@suse.com
-- remote: Revise a misleading message in the ocf:pacemaker:remote resource agent (bsc#946332)
+- remote: Revise a misleading message in the ocf:pacemaker:remote resource agent (bsc#946332, bsc#967383)
* bug-946332_pacemaker-resource-agent-remote-message.patch
-- remote: Correctly display the usage of the ocf:pacemaker:remote resource agent (bsc#946332)
+- remote: Correctly display the usage of the ocf:pacemaker:remote resource agent (bsc#946332, bsc#967383)
* bug-946332_pacemaker-resource-agent-remote-usage.patch
-------------------------------------------------------------------
@@ -679,7 +691,7 @@ 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)
+- xml: cl#5231 - Unset the deleted attributes in the resulting diffs (bsc#905641, bsc#967254)
- 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
diff --git a/pacemaker.spec b/pacemaker.spec
index 3d4194a..faa6ce3 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -110,7 +110,7 @@ License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and BSD-3-Clause
%endif
# AGPL-3.0 licensed extra/clustermon.sh is not present in the binary
Group: Productivity/Clustering/HA
-Version: 1.1.14+git20160229.cf67796
+Version: 1.1.14+git20160304.eb89393
Release: 0
#Release: %{pcmk_release}%{?dist}
Url: http://www.clusterlabs.org
@@ -477,7 +477,6 @@ make DESTDIR=%{buildroot} docdir=%{pcmk_docdir} V=1 install
#mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
install -d -m755 $RPM_BUILD_ROOT/var/adm/fillup-templates
-mkdir -p ${RPM_BUILD_ROOT}%{_var}/lib/pacemaker/cores
#install -m 644 mcp/pacemaker.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/pacemaker
install -m 644 mcp/pacemaker.sysconfig $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.pacemaker
#install -m 644 tools/crm_mon.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/crm_mon
@@ -535,10 +534,6 @@ done
#%systemd_post pacemaker.service
%service_add_post pacemaker.service
-if [ ! -e %{_sysconfdir}/sysconfig/pacemaker ]; then
- %fillup_only pacemaker
-fi
-
%pre
%service_add_pre pacemaker.service
@@ -554,10 +549,6 @@ fi
#%systemd_post pacemaker_remote.service
%service_add_post pacemaker_remote.service
-if [ ! -e %{_sysconfdir}/sysconfig/pacemaker ]; then
- %fillup_only pacemaker
-fi
-
%pre remote
%service_add_pre pacemaker_remote.service
@@ -570,6 +561,11 @@ fi
%service_del_postun pacemaker_remote.service
%post cli
+
+if [ ! -e %{_sysconfdir}/sysconfig/pacemaker ]; then
+ %fillup_only pacemaker
+fi
+
#%systemd_post crm_mon.service
%service_add_post crm_mon.service
@@ -610,6 +606,12 @@ if [ $1 -eq 0 ]; then
/sbin/chkconfig --del pacemaker_remote || :
fi
+%post cli
+
+if [ ! -e %{_sysconfdir}/sysconfig/pacemaker ]; then
+ %fillup_only pacemaker
+fi
+
%endif
%pre -n libpacemaker3