Fix: ais: Prevent assertion failure on routing ais messages (bnc#805626)
Fix: OSX: clock_gettime() is not available on Darwin
Fix: OSX: Fix compilation when no stacks are supported
Fix: lrmd: Ensure portability.h is included before lrmd_private.h
Merge pull request #245 from gao-yan/build-acl

Build: ACL: Fix compilation when "--with-acl" is enabled
Low: crm_report: use paths configured in autoconf.
Fix: ipc: Fix memory leak on sending message (bnc#807172)
Merge pull request #246 from gao-yan/ipc-memory-leak

Fix: ipc: Fix memory leak on sending message (bnc#807172)
Merge pull request #247 from JamesGuthrie/fix-crm_report_autoconf

Low: crm_report: use paths configured in autoconf.
Low: crm_report: search for corosync config if not found.

The corosync config could be anywhere - instead of just giving up
on trying to find it, search the entire directory structure for it.
Low: crm_report: added -D and --max-depth option.
Merge branch 'master' of github.com:ClusterLabs/pacemaker

Conflicts:
	tools/report.common.in
Fix: cts: Repair the local-init option now that report_common is generated
Feature: lrmd: Support CIB secrets - allow storing parameters in local files (lf#2415, cl#5121, bnc#792140)

Sensitive information contained in the CIB can be moved to local files.
The CIB values are replaced by a magic string "lrm://" to signal lrmd
that it should lookup the content elsewhere.

An MD5 hash is stored in local file, by appending ".sign" extension.
lrmd checks if the hash matches the value in local files. If there is a
mismatch, the operation fails. stop operations are exceptions and they
proceed regardless (for stonith resources stop happens in stonithd and
for and for other resource it is very probable that passwords don't
influence stop).

Local files are stored in:
/var/lib/pacemaker/lrm/secrets/<rsc>/<param>

Reading from the legacy location is still possible for compatibility:
/var/lib/heartbeat/lrm/secrets/<rsc>/<param>

and files contain just a value, there's not format. The values may not
span multiple lines and whitespace at the right is stripped.

cibsecret is a program which handles user interface. It is not necessary
to use any other tools to manage the local files storage. Users don't
need to know about how and where the files are stored.
Merge pull request #236 from gao-yan/route-ais-message

Fix: ais: Prevent assertion failure on routing ais messages (bnc#805626)
Log: crmd: Improved logging of cib API call failures
Merge pull request #251 from davidvossel/pacemaker_remote

Pacemaker remote
Feature: loggin: Bypass over-dumping logic for CRIT messages
Log: crmd: Try and trace the source of a disconnection error
Test: abi-check: Upload to the correct location