Diffusion Pacemaker 6db003b91983

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

Description

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

Details

Provenance

Authored on Feb 26 2013, 8:39 PM

Parents

rP2295aff940a2: Merge pull request #235 from davidvossel/whitebox-container
rP5b6723f9415f: Fix: Fencing: Do not merge new fencing requests with stale ones from dead nodes

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

2295aff940a2 Merge pull request #235 from davidvossel/whitebox-container
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
b755d85b3b93 Low: pengine: Regression tests for whitebox container failure cases
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
977110d2043b High: pengine: Imply completed stop actions for resources living in whitebox…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
59539d4a8033 Merge pull request #234 from davidvossel/master
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
220c63db511b low: tools: Fix memleak in crm_simulate
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
9b33193999e4 Merge pull request #233 from davidvossel/master
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
eec5d377bc80 Low: crmd: Fixes assert failure on shutdown
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits

Changes (15)

Path

Size

crmd/

lrm.c

lib/

pengine/

unpack.c

pengine/

allocate.c

regression.sh

test10/

	whitebox-fail1.dot
	whitebox-move.dot

	whitebox-fail1.exp
	whitebox-move.exp

	whitebox-fail1.scores
	whitebox-start.scores

	whitebox-fail1.summary
	whitebox-stop.summary

	whitebox-fail1.xml
	whitebox-stop.xml

	whitebox-fail2.dot
	whitebox-move.dot

	whitebox-fail2.exp
	whitebox-move.exp

	whitebox-fail2.scores
	whitebox-start.scores

	whitebox-fail2.summary
	whitebox-stop.summary

	whitebox-fail2.xml
	whitebox-stop.xml

tools/

crm_simulate.c

rP6db003b91983

View Options

crmd/lrm.c

View Options

lib/pengine/unpack.c

View Options

pengine/allocate.c

View Options

pengine/regression.sh

View Options

pengine/test10/whitebox-fail1.dot

View Options

pengine/test10/whitebox-fail1.exp

View Options

pengine/test10/whitebox-fail1.scores

View Options

pengine/test10/whitebox-fail1.summary

View Options

pengine/test10/whitebox-fail1.xml

View Options

pengine/test10/whitebox-fail2.dot

View Options

pengine/test10/whitebox-fail2.exp

View Options

pengine/test10/whitebox-fail2.scores

View Options

pengine/test10/whitebox-fail2.summary

View Options

pengine/test10/whitebox-fail2.xml

View Options

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

Description

Details

Event Timeline

Merged Changes

Changes (15)

rP6db003b91983

crmd/lrm.c

lib/pengine/unpack.c

pengine/allocate.c

pengine/regression.sh

pengine/test10/whitebox-fail1.dot

pengine/test10/whitebox-fail1.exp

pengine/test10/whitebox-fail1.scores

pengine/test10/whitebox-fail1.summary

pengine/test10/whitebox-fail1.xml

pengine/test10/whitebox-fail2.dot

pengine/test10/whitebox-fail2.exp

pengine/test10/whitebox-fail2.scores

pengine/test10/whitebox-fail2.summary

pengine/test10/whitebox-fail2.xml

tools/crm_simulate.c

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