HomeClusterLabs Projects
Diffusion Pacemaker e1585a29875b

Hg: Automated merge
e1585a29875b
Actions

Description

Hg: Automated merge

Mercurial revision: 43e20939ff53a2e9758a10de9ae8da3061a254d4

Details

Provenance
Andrew Beekhof <andrew@beekhof.net>Authored on Mar 9 2010, 3:48 AM
Parents
rPab3039d0807f: High: ais: Do not count votes from offline nodes and calculate current #votes…
rP441442fada03: Low: doc: Clean up creation of generated docs and make the brand configurable
Branches
Unknown
Tags
Unknown

Event Timeline

Merged Changes

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

Changes (137)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.
PathSize
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/
shell/
modules/
tools/
xml/
constraints-1.0.rng
constraints.rng.in
constraints-1.1.rng
constraints.rng.in
constraints-1.2.rng
constraints.rng.in
nvset.rng
nvset.rng.in
pacemaker-1.0.rng
pacemaker.rng.in
pacemaker-1.1.rng
pacemaker.rng.in
pacemaker-1.2.rng
pacemaker.rng.in
resources-1.0.rng
resources.rng.in
resources-1.1.rng
resources.rng.in
resources-1.2.rng
resources.rng.in
rule.rng
rule.rng.in

rPe1585a29875b

View Options

crmd/Makefile.am

View Options

crmd/control.c

View Options

crmd/fsa_defines.h

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

View Options

cts/CTSvars.py.in

View Options

cts/Makefile.am

View Options

cts/OCFIPraTest.py

View Options

cts/__init__.py

View Options

doc/Makefile.am

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/pengine/utils.c

View Options

lib/plugins/lrm/Makefile.am

View Options

lib/plugins/lrm/raexecstonith.c

View Options

lib/transition/unpack.c

View Options

pacemaker.spec

View Options

pengine/allocate.c

View Options

pengine/clone.c

View Options

pengine/constraints.c

View Options

pengine/graph.c

View Options

pengine/group.c

View Options

pengine/master.c

View Options

pengine/native.c

View Options

pengine/pengine.h

View Options

pengine/ptest.c

View Options

pengine/regression.core.sh

View Options

pengine/regression.core.sh.in

View Options

pengine/regression.sh

View Options

pengine/test10/594.exp

View Options

pengine/test10/829.exp

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/bug-lf-2171.scores

View Options

pengine/test10/bug-lf-2171.xml

View Options

pengine/test10/interleave-pseudo-stop.exp

View Options

pengine/test10/master-7.exp

View Options

pengine/test10/master-8.exp

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/rec-node-13.exp

View Options

pengine/test10/rec-node-15.exp

View Options

pengine/test10/stonith-0.exp

View Options

pengine/test10/stonith-1.exp

View Options

pengine/test10/stonith-2.exp

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

shell/modules/cibconfig.py

View Options

shell/modules/parse.py

View Options

shell/modules/ui.py.in

View Options

shell/modules/vars.py.in

View Options

shell/modules/xmlutil.py

View Options

tools/Makefile.am

View Options

tools/crm_inject.c

View Options

tools/crm_report.in

View Options

tools/haresources2cib.py.in

View Options

tools/ipmiservicelogd.c

View Options

tools/regression.sh

View Options

tools/report.collector

View Options

tools/report.common

View Options

xml/Makefile.am

View Options

xml/constraints-1.0.rng

View Options

xml/constraints-1.1.rng

View Options

xml/constraints-1.2.rng

View Options

xml/constraints.rng.in

View Options

xml/nvset.rng.in

View Options

xml/pacemaker-1.0.rng

View Options

xml/pacemaker-1.1.rng

View Options

xml/pacemaker-1.2.rng

View Options

xml/pacemaker.rng.in

View Options

xml/resources-1.0.rng

View Options

xml/resources-1.1.rng

View Options

xml/resources-1.2.rng

View Options

xml/resources.rng.in

View Options

xml/rule.rng.in

View Options

xml/versions.rng