Refactor: cib: Check if on-disk cib is corrupt in the separate on_disk_cib_corrupt() rather than in validate_on_disk_cib()
Merge pull request #455 from gao-yan/on-disk-cib-corrupt-2

Refactor: cib: Check if on-disk cib is corrupt in the separate on_disk_cib_corrupt() rather than in validate_on_disk_cib()
Fix: get_cluster_type: failing concurrent tool invocations on heartbeat

When we try to guess the cluster type with a "trial registration"
to the heartbeat api, try to register as "casual" (anonymous) client.

If we try to register as "non-casual", or "named" client,
from the heartbeat API point of view, we try to register as
a specific service provider.  Heartbeat does not allow multiple
registrations of the same service provider.

That results in for example
  WARN: duplicate client add request [crm_node]
  ERROR: api_process_registration_msg: cannot add client()
and all but one concurrent invokations of some tool will fail.

This seems to have been broken for quite a while now.  But since it only
triggers for concurrent invocations of the same tool, no-one seems to
have noticed, or at least not reported.

There is a simple workaround: export HA_cluster_type=heartbeat
(which avoids this trial registration probing altogether)
Merge pull request #456 from lge/for-beekhof

Fix: get_cluster_type: failing concurrent tool invocations on heartbeat
Low: crm_mon: Add failures to --as-xml output

bz#5172

Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>
Merge pull request #458 from chrissie-c/master

Low: crm_mon: Add failures to --as-xml output
Fix: crmd: Ack pending operations that were cancelled due to rsc deletion
Low: crmd: Remove dead code and improve code comments
Fix: services: Do not allow duplicate recurring op entries

Duplicate recurring operations silently replace each
other in a way that makes the original entry impossible
to cancel.  This can cause unexpected monitor failures to
occur  after resources were thought to have been stopped.
High: lrmd: Merge duplicate recurring monitor operations

Never allow two instances of the same recurring monitor operation
to exist in the lrmd.
Low: lrmd: recurring op merger regression tests
Low: lrmd: Warning msg to indicate duplicate op merge has occurred
Fix: lrmd: Cancel recurring operations before stop action is executed
Fix: mainloop: Fixes use after free in process monitor code
Feature: xml: Enable resource sets in location constraints for 1.2 schema
Merge pull request #457 from davidvossel/lrm-rsc-del

lrmd edge cases
Low: lrmd: clean up the agent's entire process group
Merge pull request #461 from inouekazu/kill_process_group

Low: lrmd: clean up the agent's entire process group
Merge pull request #460 from gao-yan/location-sets-schema

Feature: xml: Enable resource sets in location constraints for 1.2 schema
Merge branch 'master' of github.com:ClusterLabs/pacemaker