Diffusion Pacemaker 9c43596133f3

Hg: Automated merge
9c43596133f3
Actions

Description

Hg: Automated merge

Mercurial revision: 86a1d0023036929cd024f72eb9b58400c558f132

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on Jan 8 2010, 9:43 AM

Parents

rP2db3991cd356: Dev: Tools: Cleanup of crm_simulate internals
rP58805874b65b: Dev: Tools: crm: don't fall apart if there's no help text file

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

58805874b65b Dev: Tools: crm: don't fall apart if there's no help text file
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
b9a2df9b0152 Dev: pengine: crmd: Ensure help text includes correct binary name
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
4788d635bf48 Low: cts: Add the 'cmd' to the output of external commands
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
06f1caac453d Low: PE: Don't overwrite the value of batch-limit
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
7e519aa0eac6 High: crmd: Ensure batch-limit is correctly enforced
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
f403b6a4265f Dev: Tools: crm: move one reference of CibShadow down
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
89e31c39f011 Low: pengine/crmd: move crm_log_init after version and metadata calls (LF 2272)
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
1da6343b257b Dev: Tools: crm: drop a debug message
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
96c0b42abf7e High: Tools: crm: load help from crm_cli.txt
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
b22d3009738f Medium: PE: Only complain about target-role=master for non m/s resources
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
7d3dcfcf2cc7 Medium: Tools: crm: exclude locations when testing for pathological constraints…
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
c0823fbfe9ca Low: cts: standby: add log marks and drop sleeps
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
51dfd10369fa Low: cts: fix one log mark reference
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
e62eabcf0477 Low: cts: add log mark function
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
a6e42ee45d4e Low: PE: Minor code cleanup
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
9167cd4e6889 High: PE: Bug lf#2153 -
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
56eae00a4e31 Small fixes to the controld RA
Author
Jiaju Zhang <jjzhang.linux@gmail.com>
Browse Repository
No Audits
1920398d1d51 Hg: Automated merge
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
abae19464a0d High: PE: Bug lf#2153 - Finished
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
77589535ae1f High: PE: Bug lf#2153 - More improvements, not finished
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
ee0cbe3aceaf Low: Tools: crm: direct RA interface for lsb class resource agents (LF 2270)
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
742a6eb65fef Dev: Tools: crm: fix and uniq and sort the RA types list
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
adbd92743136 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
119effff10f6 Medium: Tools: crm: direct RA interface for stonith class resource agents (LF…
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
6abe9480783a Low: PE: Update regression tests for the prior commit
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
b136b08b2554 Medium: PE: Prevent non-multistate resources from being promoted through target…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
435d779d37b3 Low: Tools: crm: rename some misnamed functions
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
4d4e7b0d2ec6 Medium: Tools: crm: implement -F (--force) option
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
18d6b92cdddf Low: Tools: crm: catch EOFError exception in raw_input (LF 2289)
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
b20421c4a0bd Low: Tools: crm: fix OCF_ROOT processing
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
7bd4bd3db614 Low: Tools: crm: relax check for RA existence (LF 2270)
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
aac8b352d94b Low: Tools: crm: allow entering level and input file (-f)
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
85879f530e27 Dev: cts: Fix copy/paste error
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
16bd63a8fc19 Medium: Tools: Bug lf#2286 - Allow the shell to accept template parameters on…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
2faf5f860ec7 Medium: Tools: crm: fix exit code on single shot commands
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
32572ca0d77d Medium: Tools: crm: stay in crm if user specified level only (LF 2286)
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
7ebf080b92fa Low: Tools: crm: define missing index in validate_template (LF 2287)
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits

Changes (51)

Path

Size

crmd/

cts/

doc/

extra/

resources/

controld

lib/

pengine/

transition/

pengine/

test10/

migrate-start-complex.dot

migrate-start-complex.exp

migrate-start.dot

migrate-start.exp

migrate-stop_start.dot

migrate-stop_start.exp

	target-2.dot
	target-1.dot

target-2.exp

	target-2.scores
	target-1.scores

	target-2.xml
	target-1.xml

utils.c

utils.h

tools/

crm.in

rP9c43596133f3

View Options

crmd/main.c

View Options

cts/CTS.py

View Options

cts/CTStests.py

View Options

doc/crm_cli.txt

View Options

extra/resources/controld

View Options

lib/pengine/utils.c

View Options

lib/transition/graph.c

View Options

pengine/clone.c

View Options

pengine/group.c

View Options

pengine/main.c

View Options

pengine/native.c

View Options

pengine/ptest.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-1685.dot

View Options

pengine/test10/bug-1685.exp

View Options

pengine/test10/bug-n-387749.dot

View Options

pengine/test10/bug-n-387749.exp

View Options

pengine/test10/inc1.dot

View Options

pengine/test10/inc1.exp

View Options

pengine/test10/master-13.dot

View Options

pengine/test10/master-13.exp

View Options

pengine/test10/master-pseudo.dot

View Options

pengine/test10/master-pseudo.exp

View Options

pengine/test10/migrate-start-complex.dot

View Options

pengine/test10/migrate-start-complex.exp

View Options

pengine/test10/migrate-start.dot

View Options

pengine/test10/migrate-start.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-2.dot

View Options

pengine/test10/novell-252693-2.exp

View Options

pengine/test10/novell-252693-3.dot

View Options

pengine/test10/novell-252693-3.exp

View Options

pengine/test10/probe-2.dot

View Options

pengine/test10/probe-2.exp

View Options

pengine/test10/probe-2.xml

View Options

pengine/test10/target-1.dot

View Options

pengine/test10/target-1.exp

View Options

pengine/test10/target-1.scores

View Options

pengine/test10/target-1.xml

View Options

pengine/test10/target-2.dot

View Options

pengine/test10/target-2.exp

View Options

pengine/test10/target-2.scores

View Options

pengine/test10/target-2.xml

View Options

pengine/utils.c

View Options

pengine/utils.h

View Options

Hg: Automated merge9c43596133f3Actions

Description

Details

Event Timeline

Merged Changes

Changes (51)

rP9c43596133f3

crmd/main.c

cts/CTS.py

cts/CTStests.py

doc/crm_cli.txt

extra/resources/controld

lib/pengine/utils.c

lib/transition/graph.c

pengine/clone.c

pengine/group.c

pengine/main.c

pengine/native.c

pengine/ptest.c

pengine/regression.sh

pengine/test10/bug-1572-1.dot

pengine/test10/bug-1572-1.exp

pengine/test10/bug-1685.dot

pengine/test10/bug-1685.exp

pengine/test10/bug-n-387749.dot

pengine/test10/bug-n-387749.exp

pengine/test10/inc1.dot

pengine/test10/inc1.exp

pengine/test10/master-13.dot

pengine/test10/master-13.exp

pengine/test10/master-pseudo.dot

pengine/test10/master-pseudo.exp

pengine/test10/migrate-start-complex.dot

pengine/test10/migrate-start-complex.exp

pengine/test10/migrate-start.dot

pengine/test10/migrate-start.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-2.dot

pengine/test10/novell-252693-2.exp

pengine/test10/novell-252693-3.dot

pengine/test10/novell-252693-3.exp

pengine/test10/probe-2.dot

pengine/test10/probe-2.exp

pengine/test10/probe-2.xml

pengine/test10/target-1.dot

pengine/test10/target-1.exp

pengine/test10/target-1.scores

pengine/test10/target-1.xml

pengine/test10/target-2.dot

pengine/test10/target-2.exp

pengine/test10/target-2.scores

pengine/test10/target-2.xml

pengine/utils.c

pengine/utils.h

tools/crm.in

Hg: Automated merge
9c43596133f3
Actions