Test: lrmd: Ensure the lsb script is executable
Fix: crm_failcount: Better error reporting when no resource is specified
Fix: systemd: Convince clang that 'op' is not NULL
Feature: crm_resource: Implement an intelligent restart capability
Test: cts: sbd patterns to ignore
Merge branch 'master' of github.com:ClusterLabs/pacemaker
Fix: crm_resource: Calculate how long to wait for a restart based on the resource timeouts
Fix: crm_resource: Implement --timeout for resource restart operations
Fix: crm_resource: Allow resource restart operations to be node specific
Fix: crm_resource: Repair regression test outputs
Fix: attrd: Clean out the node cache when requested by the admin
Fix: attrd: Simplify how node deletions happen
Fix: Membership: Detect and resolve nodes that change their ID
Fix: cib: Avoid nodeid conflicts we don't care about
Doc: Clusters from Scratch: Fix pcs commands
Fix: fencing: Allow nodes to be purged from the member cache
Doc: CfS: Publican doesnt like something about this part of the chinese translation
Fix: crm_node: Correctly remove nodes from the CIB by nodeid
Merge branch 'master' of github.com:ClusterLabs/pacemaker

Conflicts:
	lrmd/regression.py.in
Log: xml: Reduce severity of xslt upgrade messages