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

Description

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

Details

Provenance

Authored on Apr 10 2012, 7:54 AM

Parents

rP44d88b17ed5b: Merge pull request #60 from davidvossel/bug-5047
rP3180968eed79: Low: PE: Reduce the amount of special cases when calculating what actions are…

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

44d88b17ed5b Merge pull request #60 from davidvossel/bug-5047
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
4f030a650d5a Merge pull request #57 from davidvossel/bug-5053
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
a565970d0624 Merge pull request #51 from davidvossel/bug-5025
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
3c965bd23e3c Merge pull request #58 from davidvossel/bug-5051
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
1244013d2a03 Merge pull request #61 from davidvossel/as_xml_oneshot
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
13df1b4c23e8 Low: tools: rhbz#754216 - Make crm_mon --as-xml option default to --one-shot…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
16d5c3168845 Low: cts: cl#5047 - Suppress cts badnews output related to fencing when fencing…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
338626f86309 High: crmd: cl#5053 - Fixes fail-count not being updated properly.
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
89a171420967 High: crmd: cl#5051 - Fixes file leak in pe ipc connection initialization.
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
f62ea46083ff Low: pengine: cl#5025 Regression tests for automatic failure cleanup on restart…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
9d3f7460fba3 Low: pengine: cl#5025 - Regression tests for failure cleanup on rsc config…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
9263480e98dc Low: pengine: cl#5025 - Automatically clear failures when resource…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits

Changes (19)

Path

Size

crmd/

pengine.c

cts/

CTS.py

CTSscenarios.py

lib/

cluster/

pengine/

test10/

	bug-5025-2.dot
	date-2.dot

	bug-5025-2.exp
	bug-5014-GROUP-A-stopped-B-stopped.exp

tools/

rPbc575cd29ee5

View Options

crmd/pengine.c

View Options

cts/CTS.py

View Options

cts/CTSscenarios.py

View Options

lib/cluster/cluster.c

View Options

pengine/allocate.c

View Options

pengine/regression.sh

View Options

pengine/test10/bug-5025-1.dot

View Options

pengine/test10/bug-5025-1.exp

View Options

pengine/test10/bug-5025-1.scores

View Options

pengine/test10/bug-5025-1.xml

View Options

pengine/test10/bug-5025-2.dot

View Options

pengine/test10/bug-5025-2.exp

View Options

pengine/test10/bug-5025-2.scores

View Options

pengine/test10/bug-5025-2.xml

View Options

pengine/test10/bug-5025-3.dot

View Options

pengine/test10/bug-5025-3.exp

View Options

pengine/test10/bug-5025-3.scores

View Options

pengine/test10/bug-5025-3.xml

View Options

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

Description

Details

Event Timeline

Merged Changes

Changes (19)

rPbc575cd29ee5

crmd/pengine.c

cts/CTS.py

cts/CTSscenarios.py

lib/cluster/cluster.c

pengine/allocate.c

pengine/regression.sh

pengine/test10/bug-5025-1.dot

pengine/test10/bug-5025-1.exp

pengine/test10/bug-5025-1.scores

pengine/test10/bug-5025-1.xml

pengine/test10/bug-5025-2.dot

pengine/test10/bug-5025-2.exp

pengine/test10/bug-5025-2.scores

pengine/test10/bug-5025-2.xml

pengine/test10/bug-5025-3.dot

pengine/test10/bug-5025-3.exp

pengine/test10/bug-5025-3.scores

pengine/test10/bug-5025-3.xml

tools/crm_mon.c

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