Test: tools: Remove line numbers from ACL test output
Fix: cib: cl#5222 - Prevent assert in xml_calculate_changes() on performing cib operations
Merge pull request #543 from gao-yan/cib_perform_op-assert

Fix: cib: cl#5222 - Prevent assert in xml_calculate_changes() on performing cib operations
Fix: crm_report: Correctly detect large files
Fix: crmd: avoid double free caused by nested hash table removal

The hashtable destroy callback for ipc proxy objects in the crmd
ended up calling hashtable remove on the hashtable element that
was already being freed.

Essentially invoking a hashtable remove would call some destroy
callback which in turn would call hashtable remove once again
on the same object. The reasoning for using this logic to begin
with was not insane.  The expectation was that hashtable remove
would unlink the object before calling the destroy object callback.
Apparently this is not the case.

This patch avoids the nested hashtable remove.
Fix: ignore SIGPIPE with gnutls is in use

SIGPIPE causes pacemaker_remote and any other pacemaker
related component that uses GNUTLS to exit unexpectedly.
According to the GNUTLS server examples provided with the
GNUTSL source packages, SIGPIPE should be ignored.
Merge pull request #544 from davidvossel/cts-lxc-updates

Fix: crmd: avoid double free caused by nested hash table removal
Test:cts: fix shutdown pattern not found issue

Systemd add patch to honour the kernel's quiet cmdline argument,
so the old message will not be output.

See http://cgit.freedesktop.org/systemd/systemd/commit/?id=e683212f049ac5d3f95fb17300cfa2fd971f78f3
Fix: crm_diff: Remove mention of --filter option from usage
Merge pull request #547 from krig/crm_diff-filter

Fix: crm_diff: Remove mention of --filter option from usage
Merge pull request #546 from xiali/mybranch

Test:cts: fix shutdown pattern not found issue
Fix: lrmd: Prevent OCF agents from logging to random files due to "value" of setenv() being NULL
Fix: controld: Return OCF_ERR_INSTALLED instead of OCF_NOT_INSTALLED

there is no error value OCF_NOT_INSTALLED defined.
Merge pull request #549 from ldzhong/1.1

Fix: controld: Return OCF_ERR_INSTALLED instead of OCF_NOT_INSTALLED
Merge pull request #548 from gao-yan/ocf-log-setenv

Fix: lrmd: Prevent OCF agents from logging to random files due to "value" of setenv() being NULL
Fix: crmd: Remove unknown nodes with conflicting unames from CIB
Merge pull request #550 from gao-yan/remove-unknown-conflicting-node

Fix: crmd: Remove unknown nodes with conflicting unames from CIB
Fix: crmd: Remove state of unknown nodes with conflicting unames from CIB
Merge branch '1.1'
Merge branch 'master' of github.com:ClusterLabs/pacemaker