Diffusion Pacemaker b9a7889358e4

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

Description

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

Conflicts:
crmd/messages.c

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on Jun 20 2012, 2:45 AM

Parents

rP90f41283be1f: Merge pull request #85 from davidvossel/bug-5068
rPe1651e8136a7: High: PE: Fix use-of-NULL in master_score() reported by coverity

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

90f41283be1f Merge pull request #85 from davidvossel/bug-5068
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
37781174b1ec Merge pull request #89 from gao-yan/acl-libqb
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
39a428eaa56e High: Tools: attrd - Fix compilation when "--with-acl" is disabled
Author
gao-yan
Browse Repository
No Audits
5c9faa9e6ed9 Merge pull request #86 from gao-yan/acl-libqb
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
4bdf7b0ca016 High: ACL: Support ACLs with libqb
Author
gao-yan
Browse Repository
No Audits
ae23f0d55d5d Merge pull request #88 from kskmori/cib-memleak
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
08ea7a19f102 High: Fix memory leak in cib related to libqb ipc.
Author
kskmori
Browse Repository
No Audits
49fbd841bc3f High: Fix memory leak in cib when writing the cib contents.
Author
kskmori
Browse Repository
No Audits
5ae1c92fd523 High: crmd: cl#5068 - Fixes crm_node -R option so it works with corosync 2.0
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
bf4e39e5a0c8 Merge pull request #84 from davidvossel/bug-5069
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
54726b75f83f Low: pengine: cl#5069 - Regression tests for on-fail=ignore
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
833dc3ce59c1 High: pengine: cl#5069 - Honor 'on-fail=ignore' even when operation is disabled.
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits

Changes (21)

Path

Size

cib/

crmd/

include/

crm/

common/

util.h

crm.h

lib/

ais/

common/

pengine/

pengine/

test10/

bug-5069-op-disabled.dot

bug-5069-op-disabled.exp

	bug-5069-op-disabled.scores
	monitor-onfail-restart.scores

bug-5069-op-disabled.xml

	bug-5069-op-enabled.dot
	bug-5025-2.dot

	bug-5069-op-enabled.exp
	bug-5014-GROUP-A-stopped-B-stopped.exp

	bug-5069-op-enabled.scores
	monitor-onfail-restart.scores

bug-5069-op-enabled.xml

tools/

attrd.c

crm_node.c

rPb9a7889358e4

View Options

cib/callbacks.c

View Options

cib/io.c

View Options

configure.ac

View Options

crmd/control.c

View Options

crmd/messages.c

View Options

include/crm/common/util.h

View Options

include/crm/crm.h

View Options

lib/ais/utils.c

View Options

lib/common/utils.c

View Options

lib/pengine/utils.c

View Options

pengine/regression.sh

View Options

pengine/test10/bug-5069-op-disabled.dot

View Options

pengine/test10/bug-5069-op-disabled.exp

View Options

pengine/test10/bug-5069-op-disabled.scores

View Options

pengine/test10/bug-5069-op-disabled.xml

View Options

pengine/test10/bug-5069-op-enabled.dot

View Options

pengine/test10/bug-5069-op-enabled.exp

View Options

pengine/test10/bug-5069-op-enabled.scores

View Options

pengine/test10/bug-5069-op-enabled.xml

View Options

tools/attrd.c

View Options

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

Description

Details

Event Timeline

Merged Changes

Changes (21)

rPb9a7889358e4

cib/callbacks.c

cib/io.c

configure.ac

crmd/control.c

crmd/messages.c

include/crm/common/util.h

include/crm/crm.h

lib/ais/utils.c

lib/common/utils.c

lib/pengine/utils.c

pengine/regression.sh

pengine/test10/bug-5069-op-disabled.dot

pengine/test10/bug-5069-op-disabled.exp

pengine/test10/bug-5069-op-disabled.scores

pengine/test10/bug-5069-op-disabled.xml

pengine/test10/bug-5069-op-enabled.dot

pengine/test10/bug-5069-op-enabled.exp

pengine/test10/bug-5069-op-enabled.scores

pengine/test10/bug-5069-op-enabled.xml

tools/attrd.c

tools/crm_node.c

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