Diffusion Pacemaker 1b700298909b

Hg: Automated merge
1b700298909b
Actions

Description

Hg: Automated merge

Mercurial revision: c4e97c592735232432e5e8f593dc6442ce86aa3d

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on Feb 15 2010, 3:13 PM

Parents

rPe2ca822929ef: Low: PE: Repair minor merge conflict
rP6a5625d23fd1: High: ais: Bug lf#2340 - Force rogue child processes to terminate after waiting…

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

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

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
953aa8a1ba6d Low: crmd: Sign up for fencing notifications - but don't act on them
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
098b64e92895 Low: crmd: Log text version of fencing error codes
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
b40aece2bb96 Low: crmd: Give stonith-ng some breathing space to report timeouts itself
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
d9a70ffd48b3 Low: Tools: crm_simulate - ensure stdout is flushed so that logging sent to…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
0bc257088318 High: crmd: Prevent use-of-NULL when non-DCs get stonith callbacks
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
6f32fe013614 Medium: tools: crm_simulate - Fix in-place simulations
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
d5f63d0da641 Medium: cib: Pick an appropriate shadow directory for regular users
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
31ce79d98930 Medium: Fencing: Reject unknown agents
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
167fa5b6968e High: Fencing: Correctly parse arg maps and do not return a provider for…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
25608cefa6cb High: Fencing: Include F_STONITH_CLIENTID in the remote query so that peers can…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
d431a3923c4b High: fencing: Fix can_fence_host_with_device() logic and improve hostlist…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
3ae98c0f7423 High: crmd: Make sure we wait for fencing to complete before continuing
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
ca9fa632fa44 Low: Core: Improve assert diagnostics
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
e61190250049 Dev: Fecning: Ensure remote_op_list exists
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
2c0e674c68fc Medium: Fencing: Default to looking for hosts in the output of 'list'
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
29a4281ac07c Dev: Fencing: Include missing header
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
77b154cc7163 Dev: Core: Filter attributes containing a colon too
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
bbde6191cfd8 Dev: Fencing: Move proctrack include to the correct location
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
2d7d0e367c43 Dev: Fencing: Add missing header
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
e02991deb2b9 Dev: Core: Filter out meta attributes beginning with a hash symbol
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
c9a90bdfb6d0 High: Fencing: Overhaul the fencing daemon
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
1a03f83a2574 Low: fencing: Add compatibility code to fence_legacy
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
33d99707e1cf Medium: PE: Include node attributes for the node to be fenced
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
0708a9592993 Low: Build: Tweak helper targets
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
5a5a7c3b90cc Low: fencing: Allow the retrieval of device metadata with the admin tool
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
9d86252a41f5 Low: cts: Correctly process stonith options
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
45cc597f0c82 Low: PE: Use crm_simulate for regression tests and allow it to be run from…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
b474cd341b7b Dev: Tools: crm_simulate - Implement --set-datetime
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
ff925cec3c15 Hg: Automated merge
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
9c43596133f3 Hg: Automated merge
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
2db3991cd356 Dev: Tools: Cleanup of crm_simulate internals
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
4b2af32adb0d High: crmd: Always connect to stonith
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
9dc90ec40898 Medium: PE: Make crm_simulate a full replacement for ptest
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
bddd35d6f2e2 Low: tools: Rename crm_inject as crm_simulate
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
96f3cd537002 Medium: PE: Allow resource sets to be reused between ordering and colocation…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
5ecbee9f239f Low: PE: Reuse get_flags() for consistency when unpacking ordering constraints
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits

Changes (90)

Path

Size

crmd/

cts/

doc/

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

tools/

xml/

rP1b700298909b

View Options

GNUmakefile

View Options

configure.ac

View Options

crmd/Makefile.am

View Options

crmd/control.c

View Options

crmd/fsa_defines.h

View Options

crmd/lrm.c

View Options

crmd/te_actions.c

View Options

crmd/te_callbacks.c

View Options

crmd/te_callbacks.h

View Options

crmd/te_events.c

View Options

crmd/te_utils.c

View Options

crmd/tengine.c

View Options

crmd/tengine.h

View Options

cts/CIB.py

View Options

cts/CM_ais.py

View Options

cts/CM_lha.py

View Options

cts/CTS.py

View Options

cts/CTSlab.py

View Options

cts/CTStests.py

View Options

doc/crm_cli.txt

View Options

extra/resources/controld

View Options

extra/resources/pingd

View Options

fencing/Makefile.am

View Options

fencing/admin.c

View Options

fencing/commands.c

View Options

fencing/fence_legacy

View Options

fencing/internal.h

View Options

fencing/main.c

View Options

fencing/remote.c

View Options

fencing/test.c

View Options

include/Makefile.am

View Options

include/crm/ais.h

View Options

include/crm/common/util.h

View Options

include/crm/crm.h

View Options

include/crm/msg_xml.h

View Options

include/crm/pengine/status.h

View Options

include/crm/stonith-ng.h

View Options

include/crm/transition.h

View Options

lib/ais/plugin.c

View Options

lib/cib/cib_client.c

View Options

lib/common/ais.c

View Options

lib/common/utils.c

View Options

lib/common/xml.c

View Options

lib/fencing/Makefile.am

View Options

lib/fencing/st_client.c

View Options

lib/pengine/common.c

View Options

lib/pengine/complex.c

View Options

lib/pengine/status.c

View Options

lib/pengine/unpack.c

View Options

lib/plugins/lrm/Makefile.am

View Options

lib/plugins/lrm/raexecstonith.c

View Options

lib/transition/unpack.c

View Options

pengine/clone.c

View Options

pengine/constraints.c

View Options

pengine/graph.c

View Options

pengine/master.c

View Options

pengine/native.c

View Options

pengine/pengine.h

View Options

pengine/regression.core.sh

View Options

pengine/regression.core.sh.in

View Options

pengine/regression.sh

View Options

pengine/test10/balanced.dot

View Options

pengine/test10/balanced.exp

View Options

pengine/test10/balanced.scores

View Options

pengine/test10/balanced.xml

View Options

pengine/test10/minimal.dot

View Options

pengine/test10/minimal.exp

View Options

pengine/test10/minimal.scores

View Options

pengine/test10/minimal.xml

View Options

pengine/test10/order-serialize-set.dot

View Options

pengine/test10/order-serialize-set.exp

View Options

pengine/test10/order-serialize-set.scores

View Options

pengine/test10/order-serialize-set.xml

View Options

pengine/test10/order-serialize.dot

View Options

pengine/test10/order-serialize.exp

View Options

pengine/test10/order-serialize.scores

View Options

pengine/test10/order-serialize.xml

View Options

pengine/test10/utilization.dot

View Options

pengine/test10/utilization.exp

View Options

pengine/test10/utilization.scores

View Options

pengine/test10/utilization.xml

View Options

pengine/utils.c

View Options

pengine/utils.h

View Options

tools/Makefile.am

View Options

tools/crm_inject.c

View Options

tools/ipmiservicelogd.c

View Options

tools/regression.sh

View Options

xml/constraints.rng.in

View Options

xml/pacemaker.rng.in

View Options

Hg: Automated merge1b700298909bActions

Description

Details

Event Timeline

Merged Changes

Changes (90)

rP1b700298909b

GNUmakefile

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/CTSlab.py

cts/CTStests.py

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/plugins/lrm/Makefile.am

lib/plugins/lrm/raexecstonith.c

lib/transition/unpack.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

pengine/test10/balanced.dot

pengine/test10/balanced.exp

pengine/test10/balanced.scores

pengine/test10/balanced.xml

pengine/test10/minimal.dot

pengine/test10/minimal.exp

pengine/test10/minimal.scores

pengine/test10/minimal.xml

pengine/test10/order-serialize-set.dot

pengine/test10/order-serialize-set.exp

pengine/test10/order-serialize-set.scores

pengine/test10/order-serialize-set.xml

Hg: Automated merge
1b700298909b
Actions