Test: tools: Update regression tests for new error codes
Fix: Allow programs in the haclient group to use CRM_CORE_DIR
Merge branch 'master' of github.com:ClusterLabs/pacemaker
Fix: Use custom OCF_ROOT_DIR if requested
Feature: mcp: Prevent the cluster from trying to use cman even when it is installed
Log: crmd: Record trace data when election loops are detected
Log: pengine: Drop message severity
Log: crmd: More accurate log for A_RECOVER
Log: mcp: Update help text
Fix: crmd: Only performa dry run for deletions if built with ACL support
Fix: ipc: Allow unpriviliged clients to clean up after server failures
Feature: crm_resource: Allow individual resources to be reprobed
Fix: crmd: Indicate completion of re-probe to callers
Fix: crmd: Indicate completion of refresh to callers
Refactor: crm_resource: Make --refresh and --reprobe an alias for --cleanup [--resource name]
Merge branch 'master' of github.com:ClusterLabs/pacemaker
Fix: mcp: Update upstart job
Build: mcp: Fill in configure variables for Upstart job
Feature: mcp: Alternate Upstart job controlling both pacemaker and corosync
Fix: cman: Do not unconditionally start cman if it is already running