Diffusion Pacemaker af21bf8757ee

Hg: Automated merge
af21bf8757ee
Actions

Description

Hg: Automated merge

Mercurial revision: 00d9bcac8775a7a96e1d5cd3b1d3745f6ad39cd0

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on Dec 16 2009, 6:02 AM

Parents

rP6828324752f9: Low: cts: More flexible Process object
rP47678eb86f17: High: PE: Correctly anti-colocate with a group

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

47678eb86f17 High: PE: Correctly anti-colocate with a group
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
df325f8f5f07 Dev: PE: Revert development logging change
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
e8f37ea83740 Medium: doc: Fill in the section on removing a node from an AIS-based cluster
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
b8d9f5eff9aa Low: PE: Turn of development logging
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
7fa03676271c Low: Tools: Shell templates for gfs2
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
442f184a3a41 Low: PE: Add missing testcase
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
1a7bf7c204ba High: PE: Bug lf#2153 - Update regression tests
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
6f9cc55692b7 High: PE: Bug lf#2153 - non-clones shouldn't restart when clones stop/start on…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
70a6bba5706a Dev: cts: Revert previous commit, the higher-level call is too smart and…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
046639eee977 Dev: cts: Use the higher-level StopaCM call
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
7c2d84f6d598 Dev: cts: Repair previous commit
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
4815451ea4a9 Low: cts: Initiate stops asynchronously, but confirm with the synchronous…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits

Changes (53)

Path

Size

cts/

CTStests.py

doc/

Pacemaker_Explained/

en-US/

pengine/

test10/

coloc-negative-group.dot

coloc-negative-group.exp

coloc-negative-group.scores

coloc-negative-group.xml

migrate-stop-complex.dot

migrate-stop-complex.exp

migrate-stop.dot

migrate-stop.exp

migrate-stop_start.dot

migrate-stop_start.exp

tools/

shell/

templates/

Makefile.am

	gfs2
	ocfs2

gfs2-base

rPaf21bf8757ee

View Options

cts/CTStests.py

View Options

doc/Pacemaker_Explained/en-US/Ap-OCF.xml

View Options

doc/Pacemaker_Explained/en-US/Ch-Basics.xml

View Options

doc/Pacemaker_Explained/en-US/Ch-Nodes.xml

View Options

doc/Pacemaker_Explained/en-US/Ch-Stonith.xml

View Options

pengine/clone.c

View Options

pengine/native.c

View Options

pengine/regression.sh

View Options

pengine/test10/bug-1572-1.dot

View Options

pengine/test10/bug-1572-1.exp

View Options

pengine/test10/bug-1572-2.dot

View Options

pengine/test10/bug-1572-2.exp

View Options

pengine/test10/bug-lf-2153.dot

View Options

pengine/test10/bug-lf-2153.exp

View Options

pengine/test10/bug-lf-2153.scores

View Options

pengine/test10/bug-lf-2153.xml

View Options

pengine/test10/bug-lf-2171.dot

View Options

pengine/test10/bug-lf-2171.exp

View Options

pengine/test10/clone-no-shuffle.dot

View Options

pengine/test10/clone-no-shuffle.exp

View Options

pengine/test10/coloc-negative-group.dot

View Options

pengine/test10/coloc-negative-group.exp

View Options

pengine/test10/coloc-negative-group.scores

View Options

pengine/test10/coloc-negative-group.xml

View Options

pengine/test10/inc1.dot

View Options

pengine/test10/inc1.exp

View Options

pengine/test10/master-demote.dot

View Options

pengine/test10/master-demote.exp

View Options

pengine/test10/master-ordering.dot

View Options

pengine/test10/master-ordering.exp

View Options

pengine/test10/master-pseudo.dot

View Options

pengine/test10/master-pseudo.exp

View Options

pengine/test10/migrate-5.dot

View Options

pengine/test10/migrate-5.exp

View Options

pengine/test10/migrate-stop-complex.dot

View Options

pengine/test10/migrate-stop-complex.exp

View Options

pengine/test10/migrate-stop.dot

View Options

pengine/test10/migrate-stop.exp

View Options

pengine/test10/migrate-stop_start.dot

View Options

pengine/test10/migrate-stop_start.exp

View Options

pengine/test10/novell-239082.dot

View Options

pengine/test10/novell-239082.exp

View Options

pengine/test10/novell-252693-3.dot

View Options

pengine/test10/novell-252693-3.exp

View Options

pengine/test10/novell-252693.dot

View Options

pengine/test10/novell-252693.exp

View Options

pengine/test10/probe-2.dot

View Options

pengine/test10/probe-2.exp

View Options

pengine/test10/probe-2.scores

View Options

pengine/test10/probe-2.xml

View Options

tools/shell/templates/Makefile.am

View Options

tools/shell/templates/gfs2

View Options

tools/shell/templates/gfs2-base

Hg: Automated mergeaf21bf8757eeActions

Description

Details

Event Timeline

Merged Changes

Changes (53)

rPaf21bf8757ee

cts/CTStests.py

doc/Pacemaker_Explained/en-US/Ap-OCF.xml

doc/Pacemaker_Explained/en-US/Ch-Basics.xml

doc/Pacemaker_Explained/en-US/Ch-Nodes.xml

doc/Pacemaker_Explained/en-US/Ch-Stonith.xml

pengine/clone.c

pengine/native.c

pengine/regression.sh

pengine/test10/bug-1572-1.dot

pengine/test10/bug-1572-1.exp

pengine/test10/bug-1572-2.dot

pengine/test10/bug-1572-2.exp

pengine/test10/bug-lf-2153.dot

pengine/test10/bug-lf-2153.exp

pengine/test10/bug-lf-2153.scores

pengine/test10/bug-lf-2153.xml

pengine/test10/bug-lf-2171.dot

pengine/test10/bug-lf-2171.exp

pengine/test10/clone-no-shuffle.dot

pengine/test10/clone-no-shuffle.exp

pengine/test10/coloc-negative-group.dot

pengine/test10/coloc-negative-group.exp

pengine/test10/coloc-negative-group.scores

pengine/test10/coloc-negative-group.xml

pengine/test10/inc1.dot

pengine/test10/inc1.exp

pengine/test10/master-demote.dot

pengine/test10/master-demote.exp

pengine/test10/master-ordering.dot

pengine/test10/master-ordering.exp

pengine/test10/master-pseudo.dot

pengine/test10/master-pseudo.exp

pengine/test10/migrate-5.dot

pengine/test10/migrate-5.exp

pengine/test10/migrate-stop-complex.dot

pengine/test10/migrate-stop-complex.exp

pengine/test10/migrate-stop.dot

pengine/test10/migrate-stop.exp

pengine/test10/migrate-stop_start.dot

pengine/test10/migrate-stop_start.exp

pengine/test10/novell-239082.dot

pengine/test10/novell-239082.exp

pengine/test10/novell-252693-3.dot

pengine/test10/novell-252693-3.exp

pengine/test10/novell-252693.dot

pengine/test10/novell-252693.exp

pengine/test10/probe-2.dot

pengine/test10/probe-2.exp

pengine/test10/probe-2.scores

pengine/test10/probe-2.xml

tools/shell/templates/Makefile.am

tools/shell/templates/gfs2

tools/shell/templates/gfs2-base

Hg: Automated merge
af21bf8757ee
Actions