Diffusion Pacemaker 5e442ea17a81

Merge branch 'master' of github.com:ClusterLabs/pacemaker
5e442ea17a81
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'master' of github.com:ClusterLabs/pacemaker

Conflicts:
lrmd/regression.py.in

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on Nov 17 2014, 6:14 PM

Parents

rPaf2981bde8c4: Merge pull request #613 from gao-yan/xml-diff-unset-attr
rPc8b413ff9a47: Fix: crm_node: Correctly remove nodes from the CIB by nodeid

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

af2981bde8c4 Merge pull request #613 from gao-yan/xml-diff-unset-attr
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
5c345e810c8c Merge pull request #603 from davidvossel/tls-cleanup
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
edbae2777e86 Fix: xml: cl#5231 - Unset the deleted attributes in the resulting diffs
Author
gao-yan
Browse Repository
No Audits
4e1f05dde86d Merge pull request #612 from davidvossel/fence-test-updates
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
a7059dffb547 Low: fencing: have regression test parse logfile for patterns
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
b464e7733157 Low: fencing: stonith -l option for custom log
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
6291f3430ee8 Merge pull request #611 from davidvossel/master
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
212f8381f2c4 Low: doc: Make Clusters from Scratch compile correctly
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
5093c095c5f5 Merge pull request #609 from davidvossel/fix-travis
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
5370436fb122 Merge pull request #607 from gao-yan/services-action-conditional-cleanup
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
c191bf394a4c Merge pull request #608 from davidvossel/master
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
71b429c1399d Low: lrmd: fix regression test LSBdummy install
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
fd43a527d1f7 Low: pengine: update regression tests for rsc discovery with rules
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
a73aa261b280 Fix: pengine: make resource-discovery work with location rules
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
5331c7503c53 High: doc: documents resource-discovery location constraint option
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
d74b7e6aa3f1 Build: services: Conditionally clean up services actions
Author
gao-yan
Browse Repository
No Audits
c666561f4855 Fix: cib: tls sock cleanup for remote cib connections
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits

Changes (12)

Path

Size

doc/

Clusters_from_Scratch/

en-US/

Pacemaker_Explained/

en-US/

Ch-Constraints.txt

fencing/

regression.py.in

lib/

cib/

common/

services/

lrmd/

regression.py.in

pengine/

test10/

resource-discovery.xml

rP5e442ea17a81

doc/Clusters_from_Scratch/en-US/Ch-Apache.txt

Loading...

doc/Pacemaker_Explained/en-US/Ch-Constraints.txt

Loading...

fencing/main.c

Loading...

fencing/regression.py.in

Loading...

lib/cib/cib_remote.c

Loading...

lib/common/remote.c

Loading...

lib/common/xml.c

Loading...

lib/services/services.c

Loading...

lrmd/regression.py.in

Loading...

pengine/constraints.c

Loading...

pengine/test10/resource-discovery.xml

Loading...

pengine/utils.h

Loading...