Fix: cib: tls sock cleanup for remote cib connections
Build: services: Conditionally clean up services actions
High: doc: documents resource-discovery location constraint option
Fix: pengine: make resource-discovery work with location rules
Low: pengine: update regression tests for rsc discovery with rules
Low: lrmd: fix regression test LSBdummy install
Merge pull request #608 from davidvossel/master

resource-discovery documentation and fixes
Merge pull request #607 from gao-yan/services-action-conditional-cleanup

Build: services: Conditionally clean up services actions
Merge pull request #609 from davidvossel/fix-travis

Low: lrmd: fix regression test LSBdummy install
Low: doc: Make Clusters from Scratch compile correctly

CFS fails to compile because there is no source syntax
called 'Apache Configuration'.
Merge pull request #611 from davidvossel/master

Low: doc: Make Clusters from Scratch compile correctly
Low: fencing: stonith -l option for custom log
Low: fencing: have regression test parse logfile for patterns
Merge pull request #612 from davidvossel/fence-test-updates

make fence regression tests parse stonith logfile
Fix: xml: cl#5231 - Unset the deleted attributes in the resulting diffs
Merge pull request #603 from davidvossel/tls-cleanup

Fix: cib: tls sock cleanup for remote cib connections
Merge pull request #613 from gao-yan/xml-diff-unset-attr

Fix: xml: cl#5231 - Unset the deleted attributes in the resulting diffs
Merge branch 'master' of github.com:ClusterLabs/pacemaker

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