diff --git a/_service b/_service
index c2e700f..79c512c 100644
--- a/_service
+++ b/_service
@@ -8,10 +8,10 @@
To update to a new release, change "revision" to the desired
git commit hash and bump "version" if necessary
- 1.1.12
+ 1.1.13
-->
- 1.1.12+git%cd.%h
- a0449d443fa5c834207def5fe36a117a53c334d6
+ 1.1.13+git%cd.%h
+ 3fb7f71bf9ca2a3d6e1187fa3b74c7841d6af5a7
diff --git a/bug-806256_pacemaker-log-level-notice.patch b/bug-806256_pacemaker-log-level-notice.patch
index daeafe5..af9519f 100644
--- a/bug-806256_pacemaker-log-level-notice.patch
+++ b/bug-806256_pacemaker-log-level-notice.patch
@@ -4,11 +4,11 @@ Date: Thu Mar 14 09:41:53 2013 +0800
Log: Change some messages to notice level (bnc#806256)
-Index: pacemaker/crmd/callbacks.c
+Index: pacemaker-1.1.13+git20150720.bd8c4b5/crmd/callbacks.c
===================================================================
---- pacemaker.orig/crmd/callbacks.c
-+++ pacemaker/crmd/callbacks.c
-@@ -204,7 +204,7 @@ peer_update_callback(enum crm_status_typ
+--- pacemaker-1.1.13+git20150720.bd8c4b5.orig/crmd/callbacks.c
++++ pacemaker-1.1.13+git20150720.bd8c4b5/crmd/callbacks.c
+@@ -210,7 +210,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)) {
@@ -17,10 +17,10 @@ Index: pacemaker/crmd/callbacks.c
down->id);
st_fail_count_reset(node->uname);
-Index: pacemaker/crmd/membership.c
+Index: pacemaker-1.1.13+git20150720.bd8c4b5/crmd/membership.c
===================================================================
---- pacemaker.orig/crmd/membership.c
-+++ pacemaker/crmd/membership.c
+--- pacemaker-1.1.13+git20150720.bd8c4b5.orig/crmd/membership.c
++++ pacemaker-1.1.13+git20150720.bd8c4b5/crmd/membership.c
@@ -430,7 +430,7 @@ crm_update_quorum(gboolean quorum, gbool
crm_xml_add(update, XML_ATTR_DC_UUID, fsa_our_uuid);
@@ -30,10 +30,10 @@ Index: pacemaker/crmd/membership.c
fsa_register_cib_callback(call_id, FALSE, NULL, cib_quorum_update_complete);
free_xml(update);
}
-Index: pacemaker/crmd/tengine.c
+Index: pacemaker-1.1.13+git20150720.bd8c4b5/crmd/tengine.c
===================================================================
---- pacemaker.orig/crmd/tengine.c
-+++ pacemaker/crmd/tengine.c
+--- pacemaker-1.1.13+git20150720.bd8c4b5.orig/crmd/tengine.c
++++ pacemaker-1.1.13+git20150720.bd8c4b5/crmd/tengine.c
@@ -204,7 +204,7 @@ do_te_invoke(long long action,
destroy_graph(transition_graph);
transition_graph = unpack_graph(graph_data, graph_input);
@@ -43,16 +43,16 @@ Index: pacemaker/crmd/tengine.c
graph_input);
te_reset_job_counts();
-Index: pacemaker/fencing/remote.c
+Index: pacemaker-1.1.13+git20150720.bd8c4b5/fencing/remote.c
===================================================================
---- pacemaker.orig/fencing/remote.c
-+++ pacemaker/fencing/remote.c
-@@ -374,7 +374,7 @@ remote_op_timeout(gpointer userdata)
+--- pacemaker-1.1.13+git20150720.bd8c4b5.orig/fencing/remote.c
++++ pacemaker-1.1.13+git20150720.bd8c4b5/fencing/remote.c
+@@ -596,7 +596,7 @@ remote_op_timeout(gpointer userdata)
return FALSE;
}
- crm_debug("Action %s (%s) for %s (%s) timed out",
+ crm_notice("Action %s (%s) for %s (%s) timed out",
op->action, op->id, op->target, op->client_name);
- op->state = st_failed;
+ if (op->phase == st_phase_on) {
diff --git a/pacemaker-1.1.12+git20150602.a0449d4.tar.bz2 b/pacemaker-1.1.12+git20150602.a0449d4.tar.bz2
deleted file mode 100644
index 3bf7997..0000000
--- a/pacemaker-1.1.12+git20150602.a0449d4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c20a0a34a2c3cf289afe58a88538ef9526872c06a74d3bde54cccac823c9ec9a
-size 9615022
diff --git a/pacemaker-1.1.13+git20150730.3fb7f71.tar.bz2 b/pacemaker-1.1.13+git20150730.3fb7f71.tar.bz2
new file mode 100644
index 0000000..e31810b
--- /dev/null
+++ b/pacemaker-1.1.13+git20150730.3fb7f71.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e4bd2b09ed376683c2b366631467799e31f2d9be3ef35d3f1bc7b3217d50113a
+size 9641053
diff --git a/pacemaker.changes b/pacemaker.changes
index a1e6b52..691f2b3 100644
--- a/pacemaker.changes
+++ b/pacemaker.changes
@@ -1,3 +1,146 @@
+-------------------------------------------------------------------
+Thu Jul 30 09:46:31 UTC 2015 - ygao@suse.com
+
+- dbus: Remove redundant ref/unref of pending call records
+- stonithd: potential device list corruption
+- cib: don't destroy peer cache in peer status callback
+- systemd: Ensure pending structs are correctly unreferenced
+- systemd: Track pending operations so they can be safely cancelled
+- crmd: memory leak in CIB callbacks
+- attrd: memory leak in legacy attrd's CIB callback
+- attrd: memory leak in CIB callback
+- libcib: allow free function for user data supplied to CIB callbacks
+- xml: Prevent use-of-NULL in crm_xml_dump()
+- crm_mon: Memory leaks
+- Upstream version cs: 3fb7f71bf9ca2a3d6e1187fa3b74c7841d6af5a7
+
+-------------------------------------------------------------------
+Wed Jul 22 10:22:39 UTC 2015 - ygao@suse.com
+
+- pengine: properly handle blocked clone actions
+- pengine: Correctly bypass fencing for resources that do not require it
+- libservices: potential memory leaks when executing systemd actions
+- libservices: memory leak in DBus-related log messages
+- crmd: memory leaks in recurring operation history
+- pengine: Addtion of the clone resource clone-min metadata option
+- Upstream version cs: 3d781d3fe61504c841e3c89b2e8ccff8195d4af6
+
+-------------------------------------------------------------------
+Mon Jul 20 08:46:38 UTC 2015 - ygao@suse.com
+
+- Rebase bug-806256_pacemaker-log-level-notice.patch
+
+- Build: Update version numbers to 1.1.13 in version.m4 and sample spec file
+- fencing: Broadcast uname as soon as a peer's state has changed (bsc#938410)
+- fencing: remap sequential topology reboots to all-off-then-all-on
+- fencing: remap sequential topology reboots to off
+- fencing: support remapping reboots when processing fencing query results
+- fencing: treat remapped reboots as reboots when appropriate
+- fencing: support remapping reboots in fencing query results
+- crmd: check for errors when searching for CIB daemon's load file
+- libcib,libfencing,tools: memory leaks from xmlGetNodePath()
+- attrd: use-after-free in attrd_client_update()
+- fencing: memory leak when searching for a target's fencing topology
+- lrmd: memory leak when freeing command structure
+- libcluster: work around peer cache destruction in client status callbacks
+- fencing: add support for operation phases to device properties
+- fencing: add support for operation phases
+- crmd: Do not enforce restart for resources that support reload and don't support any unique parameters
+- crmd: Do not enforce restart for changes of non-unique parameters
+- cts: change the stack from openais (white-tank) to corosync (plugin v0) in set_stack of environment.py (bsc#936149)
+- Upstream version cs: bd8c4b5a30c9cacd0257fe50ab50d3a6436db42a
+
+-------------------------------------------------------------------
+Fri Jul 10 14:03:00 UTC 2015 - ygao@suse.com
+
+- crmd: Make resource_supports_action() really general
+- crmd: Remove a duplicate invocation of snprintf()
+- pengine: clear failures after reconnect_interval expires
+- RA: Prevent an error message on stopping "Dummy" resource
+- PE: Ignore comment blocks when unpacking the cib
+- fencing: use "off" timeout when remapping "reboot" to "off"
+- fencing: do not set call options twice in query
+- crmd: don't synthesize op failures during shutdown
+- lrmd: prevent double free after unregistering stonith device for monitoring
+- libcommon: crm_ipc_get_fd() must set errno on error
+- PE: Record the execution date in PE files so we can re-use it in crm_simulate
+- pengine: allow guest remote nodes using containers/vms to be nested in a group resource
+- pengine: Resolve memory leak in expand_notification_data()
+- cib: Prevent use-after-free and return -EINVAL when attempting to delete the whole "/cib" (bsc#934609)
+- cib: Prevent use-after-free when invoking "cibadmin --delete-all --xpath" (bsc#934609)
+- crmd: Prevent segfault when erasing resources from disconnected remote nodes
+- pengine: do not timeout remote node recurring monitor op failure until after fencing
+- crmd: No need to re-process actions we've already marked as failed
+- crmd: All pseduo ops must be allowed to complete
+- crm_simulate: Optionally include action IDs in the dot graph
+- fencing: properly decide whether a topology fencing device has been found
+- fencing: properly sort peers by number of fencing devices found
+- crmd: Record actions in the CIB as failed if we cannot execute them
+- pengine: do not stop notify a fenced node that the rscs on the fenced node stopped
+- pengine: fixes segfault in pengine when fencing remote node
+- remote: do not fail operations because of a migration
+- remote: handle merging duplicate recurring monitors for connection rsc
+- pengine: cl#5235 - Prevent graph loops that can be introduced by "load_stopped -> migrate_to" ordering
+- PE: Exclude nodes which don't match any exclusive discovery rules
+- Log: improve IPC connection error messages
+- Log: make syslog less noisy
+- lrmd: cancel currently pending STONITH op if stonithd connection is lost
+- fencing: Correct the all_topology_devices_found() implementation
+- crmd: Pre-emptively fail in-flight actions when lrmd connections fail
+- PE: Include a list of all and available nodes with notifications
+- lrmd: set recv timeout upper bound for tls connections
+- services: prevent recurring monitors from colliding with other operations
+- crmd: handle resources named the same as cluster nodes
+- crmd: make actions incompletable after remote-node fails
+- crm_simulate: Correctly invoke the policy engine library
+- libcluster: overhaul peer cache management
+- crmd: Prevent use-of-NULL
+- crm_report: Enable password sanitizing by default
+- PE: Keep the size of the secure list small in the cib
+- PE: Reduce noise when sanitized policy engine files are replayed
+- attrd: handle removals of cluster peers and remote peers consistently
+- libcluster: avoid possibility of invalidating a hash table iterator
+- membership: Ensure peer cache management supports all stacks
+- libcluster: do not re-add peer entries for exiting nodes
+- PE: Skip unrunnable actions when one-or-more is in effect
+- PE: Ensure recurring monitor operations are cancelled when clone instances are de-allocated
+- systemd: No need to trigger assert if cannot obtain an unit (bsc#931271)
+- dbus: Use operation timeout for dbus reply timeout (bsc#931271)
+- fencing: correct choice of fencing topology level
+- crm_shadow: Fix "crm_shadow --diff" (bsc#931166)
+- cib: Calculate and add digest for a patchset after accepting changes for the target xml (bsc#931114)
+- remote: enable reloads for select remote connection options
+- crmd: fence remote node after connection failure only once
+- remote: reconnect_delay option for remote nodes to delay reconnect after fence
+- tools: ignore stderr from crm_mon when running via systemd
+- xml: update RelaxNG schema for crm_mon XML output
+- Fencing: Correctly handle changes to the fencing topology
+- fencing: Allow complex configurations to apply to multiple hosts
+- tools: Update regression tests for ACL fixes
+- tools: improve failed actions display in crm_mon
+- tools: implement printing tickets in crm_mon HTML/XML output
+- tools: implement printing negative location constraints in crm_mon HTML/XML output
+- tools: implement printing operations and failcounts in crm_mon HTML/XML output
+- tools: implement printing node attributes in crm_mon HTML/XML output
+- tools: improve cluster summary display in crm_mon
+- tools: improve guest node output in crm_mon
+- tools: prettify plaintext output
+- tools: prettify crm_mon HTML output
+- tools: prettify crm_mon --simple-status output
+- crm_report: Allow log file discovery to be disabled
+- crm_resource: Support debugging promote and demote operations
+- fencing: Allow semi-colon delimiter for pcmk_host_list
+- Upstream version cs: ef86b494a411ce920eb18b9b6541a3a0425a41e0
+
+-------------------------------------------------------------------
+Fri Jul 10 11:06:45 UTC 2015 - ygao@suse.com
+
+- Update to version 1.1.13
+- Build: Update library versions
+- Build: Move new struct members to the end for backwards compatibility
+- Fencing: Gracefully handle invalid metadata from agents
+- Upstream version cs: 6052cd16c2f455809f8088af76ce86483bf98353 (Pacemaker-1.1.13)
+
-------------------------------------------------------------------
Wed Jun 3 14:40:55 UTC 2015 - ygao@suse.com
diff --git a/pacemaker.spec b/pacemaker.spec
index 21f541c..da3a67f 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+git20150602.a0449d4
+Version: 1.1.13+git20150730.3fb7f71
Release: 0
#Release: %{pcmk_release}%{?dist}
Url: http://www.clusterlabs.org
@@ -491,11 +491,6 @@ ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcpacemaker_remote
ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rccrm_mon
%endif
-# Only useful on rhel6
-rm -f %{buildroot}/%{_bindir}/ccs2cib
-rm -f %{buildroot}/%{_bindir}/ccs_flatten
-rm -f %{buildroot}/%{_bindir}/disable_rgmanager
-
%if %{with coverage}
GCOV_BASE=%{buildroot}/%{_var}/lib/pacemaker/gcov
mkdir -p $GCOV_BASE