Diffusion Pacemaker 8d3ae201c4e1

Hg: Automated merge
8d3ae201c4e1
Actions

Description

Hg: Automated merge

Mercurial revision: 0fae9cbe87e4097ef01d4656d8fc93bacb4f22b1

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on Feb 23 2010, 10:24 AM

Parents

rPfb81d45e2137: Hg: Automated merge
rP159c46accf2e: Dev: cts: Fix up log watching

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

fb81d45e2137 Hg: Automated merge
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
d19997470f79 Low: cts: Make further use of key_for_node() for corosync testing - Angus…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
7a05f7909eed Dev: xml: Add missing schema file
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
4c26e007963d Low: xml: Prepare schemas for 1.1/1.2
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
9404120b716d Low: PE: Fix regression test script
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
951ca691d0e4 Dev: Shell: restore some utilization bits
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
b2b9f531bb77 Hg: More merging with stable-1.0
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
d9d59fb41e3b Hg: Merge with stable-1.0
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
f09116252c2e Dev: Shell: fix wrong var reference
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
5d98d2006f06 Low: Shell: add tab completion for nodes (nbc#577003)
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
1eda1ff64ee9 High: Shell: support for the utilization element (old patch for the new…
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
b20fd762b744 High: PE: Allow startup probes to be disabled - their calculation is a major…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
574f5a6e2cb2 Low: PE: Minor speedup to heavily used functionality
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
61bcd178afec Low: PE: Notes on future optimization
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
291e7897f8bd Low: Build: Don't link against snmp libraries if we dont support snmp
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
35837ae096c4 Medium: PE: Some minor speed improvements to a performance bottleneck
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
17a3fef59481 High: PE: Suppress duplicate ordering constraints to achieve orders of…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
71e251341981 Dev: ais: Correctly determine when to force rogue children to terminate
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
375d1a33efa8 Low: cts: Allow some cluster managers to define alternate names to search for…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
ac5e1ba089b1 Low: Build: Update versions
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
af4fedc24af5 Hg: Automated merge
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
ccc6483099c1 Hg: Automated merge
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
1ebc75e7442f Low: Doc: Fix up-to-date workaround
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
d24c1388d9d8 Low: Build: Update the spec file for 1.1
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
00c7afb689de Low: doc: Build with the default brand unless the clusterlabs one is available
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
753f73700ecb Low: cts: Force shell commands to ignore validation
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
6c14a2c30357 Low: Tools: Purge haresources2cib.py
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
b57fff28b67d Hg: Automated merge
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
926893864bb1 build: use autoconf instead of setup.py for shell
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
7f8d11ea1e95 Low: cts: Fix the install location for cts
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
3489a7ccd4be Low: cts: OCFIPraTest is a program not a module
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
041ed6ebc474 Low: build: Formatting in configure.ac
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
1486958c8074 Low: cts: Move CTS modules into python's site-packages directory
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
dee7b556eecf Low: Build: Remove references to non-existant debian directory
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
fd374e8ce801 Low: cts: Fix qarsh compatibility
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
1b700298909b Hg: Automated merge
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
e2ca822929ef Low: PE: Repair minor merge conflict
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
30ec95657409 Hg: Automated merge
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
7325e35d7c41 High: fencing: Account for stonith_get_info() always returning a pointer to the…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
9978c2c64897 Hg: Automated merge
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
8a362a4c768c High: Fencing: Bug bnc#577007 - Correctly parse the hostlist output from…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
73f77a99f42c Medium: Fencing: fence_legacy - Always parse stdin options
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
3b01a3fe3a64 Hg: Automated merge
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
af77092efe93 Low: Tools: CLI regression tests no longer need to be run as root
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
5e4193a756ff Low: cts: Add documentation for --clobber-cib | -c option
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
bd439eabd3b2 High: Tools: crm: support for the utilization element
Author
Dejan Muhamedagic <dejan@hello-penguin.com>
Browse Repository
No Audits
fbfc61bb1392 Medium: Tools: crm_simulate - Update failcount for injected operations that…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
f29a88b80a9f Low: Fencing: Universally add 10% padding to callback timeouts to allow the…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
c6bac1b372f5 Medium: Fencing: Fix the ability for fencing notifications to be sent to all…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
a4701560365b Low: cts: Improve detection of idle DCs
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits

Changes (122)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

Path

Size

crmd/

cts/

doc/

Pacemaker_Explained/

extra/

resources/

fencing/

include/

crm/

common/

pengine/

lib/

ais/

cib/

common/

fencing/

pengine/

plugins/

lrm/

transition/

pengine/

	regression.core.sh.in
	regression.core.sh

test10/

order-serialize-set.dot

order-serialize-set.exp

order-serialize-set.scores

order-serialize-set.xml

order-serialize.dot

order-serialize.exp

order-serialize.scores

shell/

modules/

tools/

haresources2cib.py.in

ipmiservicelogd.c

regression.sh

xml/

Makefile.am

	constraints-1.0.rng
	constraints.rng.in

	constraints-1.1.rng
	constraints.rng.in

	constraints-1.2.rng
	constraints.rng.in

constraints.rng.in

	nvset.rng
	nvset.rng.in

nvset.rng.in

	pacemaker-1.0.rng
	pacemaker.rng.in

	pacemaker-1.1.rng
	pacemaker.rng.in

	pacemaker-1.2.rng
	pacemaker.rng.in

pacemaker.rng.in

	resources-1.0.rng
	resources.rng.in

	resources-1.1.rng
	resources.rng.in

	resources-1.2.rng
	resources.rng.in

resources.rng.in

	rule.rng
	rule.rng.in

rule.rng.in

versions.rng

rP8d3ae201c4e1

View Options

GNUmakefile

Load File

View Options

Makefile.am

Load File

View Options

configure.ac

Load File

View Options

crmd/Makefile.am

Load File

View Options

crmd/control.c

Load File

View Options

crmd/fsa_defines.h

Load File

View Options

crmd/lrm.c

Load File

View Options

crmd/te_actions.c

Load File

View Options

crmd/te_callbacks.c

Load File

View Options

crmd/te_callbacks.h

Load File

View Options

crmd/te_events.c

Load File

View Options

crmd/te_utils.c

Load File

View Options

crmd/tengine.c

Load File

View Options

crmd/tengine.h

Load File

View Options

cts/CIB.py

Load File

View Options

cts/CM_ais.py

Load File

View Options

cts/CM_lha.py

Load File

View Options

cts/CTS.py

Load File

View Options

cts/CTSaudits.py

Load File

View Options

cts/CTSlab.py

Load File

View Options

cts/CTStests.py

Load File

View Options

cts/CTSvars.py.in

Load File

View Options

cts/Makefile.am

Load File

View Options

cts/OCFIPraTest.py

Load File

View Options

cts/init.py

Load File

View Options

doc/Makefile.am

Load File

View Options

doc/Pacemaker_Explained/publican.cfg

Load File

View Options

doc/crm_cli.txt

Load File

View Options

extra/resources/controld

Load File

View Options

extra/resources/pingd

Load File

View Options

fencing/Makefile.am

Load File

View Options

fencing/admin.c

Load File

View Options

fencing/commands.c

Load File

View Options

fencing/fence_legacy

Load File

View Options

fencing/internal.h

Load File

View Options

fencing/main.c

Load File

View Options

fencing/remote.c

Load File

View Options

fencing/test.c

Load File

View Options

include/Makefile.am

Load File

View Options

include/crm/ais.h

Load File

View Options

include/crm/common/util.h

Load File

View Options

include/crm/crm.h

Load File

View Options

include/crm/msg_xml.h

Load File

View Options

include/crm/pengine/status.h

Load File

View Options

include/crm/stonith-ng.h

Load File

View Options

include/crm/transition.h

Load File

View Options

lib/ais/plugin.c

Load File

View Options

lib/cib/cib_client.c

Load File

View Options

lib/common/ais.c

Load File

View Options

lib/common/utils.c

Load File

View Options

lib/common/xml.c

Load File

View Options

lib/fencing/Makefile.am

Load File

View Options

lib/fencing/st_client.c

Load File

View Options

lib/pengine/common.c

Load File

View Options

lib/pengine/complex.c

Load File

View Options

lib/pengine/status.c

Load File

View Options

lib/pengine/unpack.c

Load File

View Options

lib/pengine/utils.c

Load File

View Options

lib/plugins/lrm/Makefile.am

Load File

View Options

lib/plugins/lrm/raexecstonith.c

Load File

View Options

lib/transition/unpack.c

Load File

View Options

pacemaker.spec

Load File

View Options

pengine/allocate.c

Load File

View Options

pengine/clone.c

Load File

View Options

pengine/constraints.c

Load File

View Options

pengine/graph.c

Load File

View Options

pengine/master.c

Load File

View Options

pengine/native.c

Load File

View Options

pengine/pengine.h

Load File

View Options

pengine/regression.core.sh

Load File

View Options

pengine/regression.core.sh.in

Load File

View Options

pengine/regression.sh

Load File

View Options

pengine/test10/balanced.dot

Load File

View Options

pengine/test10/balanced.exp

Load File

View Options

pengine/test10/balanced.scores

Load File

View Options

pengine/test10/balanced.xml

Load File

View Options

pengine/test10/minimal.dot

Load File

View Options

pengine/test10/minimal.exp

Load File

View Options

pengine/test10/minimal.scores

Load File

View Options

pengine/test10/minimal.xml

Load File

View Options

pengine/test10/order-serialize-set.dot

Load File

View Options

pengine/test10/order-serialize-set.exp

Load File

View Options

pengine/test10/order-serialize-set.scores

Load File

View Options

pengine/test10/order-serialize-set.xml

Load File

View Options

pengine/test10/order-serialize.dot

Load File

View Options

pengine/test10/order-serialize.exp

Load File

View Options

pengine/test10/order-serialize.scores

Load File

View Options

pengine/test10/order-serialize.xml

Load File

View Options

pengine/test10/utilization.dot

Load File

View Options

pengine/test10/utilization.exp

Load File

View Options

pengine/test10/utilization.scores

Load File

View Options

pengine/test10/utilization.xml

Load File

View Options

pengine/utils.c

Load File

View Options

pengine/utils.h

Load File

View Options

shell/modules/cibconfig.py

Load File

View Options

shell/modules/parse.py

Load File

View Options

shell/modules/ui.py.in

Load File

View Options

shell/modules/vars.py.in

Load File

View Options

shell/modules/xmlutil.py

Load File

View Options

tools/Makefile.am

Load File

View Options

tools/crm_inject.c

Load File

View Options

tools/haresources2cib.py.in

Load File

View Options

tools/ipmiservicelogd.c

Load File

View Options

tools/regression.sh

Load File

View Options

xml/Makefile.am

Load File

View Options

xml/constraints-1.0.rng

Load File

View Options

xml/constraints-1.1.rng

Load File

View Options

xml/constraints-1.2.rng

Load File

View Options

xml/constraints.rng.in

Load File

View Options

xml/nvset.rng

Load File

View Options

xml/nvset.rng.in

Load File

View Options

xml/pacemaker-1.0.rng

Load File

View Options

xml/pacemaker-1.1.rng

Load File

View Options

xml/pacemaker-1.2.rng

Load File

View Options

xml/pacemaker.rng.in

Load File

View Options

xml/resources-1.0.rng

Load File

View Options

xml/resources-1.1.rng

Load File

View Options

xml/resources-1.2.rng

Load File

View Options

xml/resources.rng.in

Load File

View Options

xml/rule.rng

Load File

View Options

xml/rule.rng.in

Load File

View Options

xml/versions.rng

Load File

Hg: Automated merge8d3ae201c4e1Actions

Description

Details

Event Timeline

Merged Changes

Changes (122)Show All Changes

Very Large Commit

rP8d3ae201c4e1

GNUmakefile

Makefile.am

configure.ac

crmd/Makefile.am

crmd/control.c

crmd/fsa_defines.h

crmd/lrm.c

crmd/te_actions.c

crmd/te_callbacks.c

crmd/te_callbacks.h

crmd/te_events.c

crmd/te_utils.c

crmd/tengine.c

crmd/tengine.h

cts/CIB.py

cts/CM_ais.py

cts/CM_lha.py

cts/CTS.py

cts/CTSaudits.py

cts/CTSlab.py

cts/CTStests.py

cts/CTSvars.py.in

cts/Makefile.am

cts/OCFIPraTest.py

cts/__init__.py

doc/Makefile.am

doc/Pacemaker_Explained/publican.cfg

doc/crm_cli.txt

extra/resources/controld

extra/resources/pingd

fencing/Makefile.am

fencing/admin.c

fencing/commands.c

fencing/fence_legacy

fencing/internal.h

fencing/main.c

fencing/remote.c

fencing/test.c

include/Makefile.am

include/crm/ais.h

include/crm/common/util.h

include/crm/crm.h

include/crm/msg_xml.h

include/crm/pengine/status.h

include/crm/stonith-ng.h

include/crm/transition.h

lib/ais/plugin.c

lib/cib/cib_client.c

lib/common/ais.c

lib/common/utils.c

lib/common/xml.c

lib/fencing/Makefile.am

lib/fencing/st_client.c

lib/pengine/common.c

lib/pengine/complex.c

lib/pengine/status.c

lib/pengine/unpack.c

lib/pengine/utils.c

lib/plugins/lrm/Makefile.am

lib/plugins/lrm/raexecstonith.c

lib/transition/unpack.c

pacemaker.spec

pengine/allocate.c

pengine/clone.c

pengine/constraints.c

pengine/graph.c

pengine/master.c

pengine/native.c

pengine/pengine.h

pengine/regression.core.sh

pengine/regression.core.sh.in

pengine/regression.sh

Hg: Automated merge
8d3ae201c4e1
Actions

Changes (122)
Show All Changes

cts/init.py