Merge branch 'master' into public
39a289bc2f1b
Actions

Description

Merge branch 'master' into public

Details

Provenance

Authored on Feb 14 2012, 5:17 AM

Parents

rPf80692bf7d34: Low: Git: Ignore built docbook files
rPe3260d84157a: Merge pull request #20 from gao-yan/template-validation

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

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

f80692bf7d34 Low: Git: Ignore built docbook files
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
ca5f8a9d1b3f Low: tools: Bug rhbz#754216 - Add XML as an output option to crm_mon
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
b5e63a5659fe Medium: mcp: Start stonith after the cib now that it connects for fencing…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
ebaa3e3cc22a Low: extra: Fix cman initialization
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
691cc799e434 Low: doc: Import chapter on utilization and placement
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
f4898788a190 Low: doc: Add P-E credits
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
5d00c6530474 High: crmd: Fast-track shutdown if we couldn't request it via attrd
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
1d6f782ad510 Low: crmd: Avoid the string 'error:' in log formats
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
176035c05320 Low: extra: cluster-init - Install the abrt package for tracking and…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
135f07261017 Low: Tools: crm_report - Record a dump of corosync config and runtime variables
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
e3e35e2a1ba2 Low: doc: Convert elements of Pacemaker Explained to asciidoc
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
fb77134e252b Low: doc: Auto-populate the --features and --help text in Ch-Tools.txt
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
71935ddd9807 Low: doc: Update the copyright year
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
edccdf0307b8 Low: doc: Fix the Logo size to avoid scrollbars
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
a068a9952e71 Low: doc: Update revision history
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
0c3f0cd4967c Low: Build: Add a clang validator target
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
5bb232686e22 Low: Build: Massage the default localstatedir and sysconfdir values
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
5661150b516e Low: doc: asciidoc is now a pre-req for publican docs
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
b365b284c559 Low: Doc: Finish off the conversion of Clusters from Scratch to asciidoc
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
78a94aff6d6d Low: doc: Center align images
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
614a26a81453 Low: doc: Generate more docbook sections from asciidoc
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
bd50bb1133e7 Low: doc: Remove stale file
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
457d98b6010a Low: doc: Generate more docbook sections from asciidoc
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
562b4c362d52 Low: doc: Munge asciidoc output into book chapters
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
52c6eab37142 Low: doc: Generate more docbook sections from asciidoc
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
683ca974385e Low: doc: Correctly create a non-visible index term
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
8567bf821826 Low: doc: Generate horrid but useful docbook from asciidoc
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
28975eb2c486 High: mcp: Shut down if one of our child processes can/should not be respawned
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
4610567f460a Low: mcp: Logging tweaks
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
6cdfbea4e88a Medium: mcp: Wait a little while for corosync to finish coming up
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
bd5b55f8e25a Medium: Tools: corosync-objctl was moved to corosync-cmapctl and changed…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
4747be644b48 High: corosync: Treat CS_ERR_QUEUE_FULL the same as CS_ERR_TRY_AGAIN
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
fc6bfc47f661 High: corosync: Ensure we catch nodes that leave the membership, even if the…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
62225d51a6cd Low: Core: Ensure trace data is sent to stderr if/when it gets enabled
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
98562b505bcd High: Core: basename() may modify its input, do not pass in a constant
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
5b06f62e47a5 High: fencing: Add the fencing topology section to the 1.1 configuration schema
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
1d11255bc5f3 High: crmd: Look for changes to the stonith topology and push them into stonith…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
f7069d2a0e9b High: fencing: Correctly remove a single fencing level for a target
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
36eb9d4e3b98 Medium: crmd: getrusage().tv_usec is not as unstable as first thought, re…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
68e46f00cd50 Low: Build: Ignore pengine test files
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
8af2aeb91523 Low: tools: Advertise the cibadmin --empty command
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
4aab0c21982d Low: Logging tweaks
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
a2c82dfb647a Medium: Build: Don't fail when overwriting daemin compatability symlinks for…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
828bc91a1b24 High: PE: Ensure post-migration stop actions occur before node shutdown
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
6690d5716d58 Low: doc: Bug cl#5033 - Fix link to SLES documentation
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
c5a6eb294980 High: crmd: Remove rusage differences of less than a second from election…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
7652f94f55b8 High: crmd: Election - perform the age comparison only once
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
3316da2e9fbd High: corosync: Correctly infer lost members from the quorum API
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
60394a9ee0d1 Low: logging tweaks
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
817fe287ad5d Medium: tools: crm_report - Obtain syslog and configured logfiles where…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits

Changes (85)

Path

Size

crmd/

cts/

doc/

Clusters_from_Scratch/

en-US/

Ch-Active-Passive.txt

Ch-Active-Passive.xml

Ch-Shared-Storage.txt

Ch-Shared-Storage.xml

Clusters_from_Scratch.ent

Revision_History.xml

Makefile.am

Pacemaker_Explained/

en-US/

Pacemaker_Explained.xml

publican-clusterlabs/

en-US/

images/

extra/

fencing/

include/

crm/

cib.h

msg_xml.h

pengine/

common.h

lib/

ais/

cib/

cluster/

common/

fencing/

pengine/

mcp/

pengine/

test10/

migrate-shutdown.scores

tools/

xml/

rP39a289bc2f1b

View Options

.gitignore

View Options

GNUmakefile

View Options

Makefile.am

View Options

configure.ac

View Options

crmd/cib.c

View Options

crmd/control.c

View Options

crmd/election.c

View Options

crmd/join_dc.c

View Options

crmd/main.c

View Options

crmd/te_actions.c

View Options

crmd/te_callbacks.c

View Options

crmd/te_utils.c

View Options

crmd/utils.c

View Options

cts/CTStests.py

View Options

doc/Clusters_from_Scratch/en-US/Ap-Cman.xml

View Options

doc/Clusters_from_Scratch/en-US/Ap-Configuration.txt

View Options

doc/Clusters_from_Scratch/en-US/Ap-Configuration.xml

View Options

doc/Clusters_from_Scratch/en-US/Ap-Corosync-Conf.txt

View Options

doc/Clusters_from_Scratch/en-US/Ap-Corosync-Conf.xml

View Options

doc/Clusters_from_Scratch/en-US/Ap-Reading.txt

View Options

doc/Clusters_from_Scratch/en-US/Ap-Reading.xml

View Options

doc/Clusters_from_Scratch/en-US/Book_Info.xml

View Options

doc/Clusters_from_Scratch/en-US/Ch-Active-Active.txt

View Options

doc/Clusters_from_Scratch/en-US/Ch-Active-Active.xml

View Options

doc/Clusters_from_Scratch/en-US/Ch-Active-Passive.txt

View Options

doc/Clusters_from_Scratch/en-US/Ch-Active-Passive.xml

View Options

doc/Clusters_from_Scratch/en-US/Ch-Apache.txt

View Options

doc/Clusters_from_Scratch/en-US/Ch-Apache.xml

View Options

doc/Clusters_from_Scratch/en-US/Ch-Installation.txt

View Options

doc/Clusters_from_Scratch/en-US/Ch-Installation.xml

View Options

doc/Clusters_from_Scratch/en-US/Ch-Intro.txt

View Options

doc/Clusters_from_Scratch/en-US/Ch-Intro.xml

View Options

doc/Clusters_from_Scratch/en-US/Ch-Shared-Storage.txt

View Options

doc/Clusters_from_Scratch/en-US/Ch-Shared-Storage.xml

View Options

doc/Clusters_from_Scratch/en-US/Ch-Stonith.txt

View Options

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

View Options

doc/Clusters_from_Scratch/en-US/Ch-Tools.txt

View Options

doc/Clusters_from_Scratch/en-US/Ch-Tools.xml

View Options

doc/Clusters_from_Scratch/en-US/Ch-Verification.txt

View Options

doc/Clusters_from_Scratch/en-US/Ch-Verification.xml

View Options

doc/Clusters_from_Scratch/en-US/Clusters_from_Scratch.ent

View Options

doc/Clusters_from_Scratch/en-US/Revision_History.xml

View Options

doc/Makefile.am

View Options

doc/Pacemaker_Explained/en-US/Author_Group.xml

View Options

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

View Options

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

View Options

doc/Pacemaker_Explained/en-US/Ch-Options.txt

View Options

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

View Options

doc/Pacemaker_Explained/en-US/Ch-Utilization.txt

View Options

doc/Pacemaker_Explained/en-US/Pacemaker_Explained.xml

View Options

doc/publican-clusterlabs/en-US/images/title_logo.svg

View Options

extra/cluster-init

View Options

fencing/commands.c

View Options

fencing/internal.h

View Options

fencing/main.c

View Options

fencing/remote.c

View Options

include/crm/cib.h

View Options

include/crm/msg_xml.h

View Options

include/crm/pengine/common.h

View Options

lib/ais/plugin.c

View Options

lib/cib/cib_utils.c

View Options

lib/cluster/corosync.c

View Options

lib/common/utils.c

View Options

lib/fencing/st_client.c

View Options

lib/pengine/clone.c

View Options

lib/pengine/group.c

View Options

lib/pengine/native.c

View Options

lib/pengine/unpack.c

View Options

lib/pengine/unpack.h

View Options

mcp/corosync.c

View Options

mcp/pacemaker.c

View Options

pengine/graph.c

View Options

pengine/native.c

View Options

pengine/regression.sh

View Options

pengine/test10/migrate-shutdown.dot

View Options

pengine/test10/migrate-shutdown.exp

View Options

pengine/test10/migrate-shutdown.scores

View Options

pengine/test10/migrate-shutdown.xml

View Options

tools/cibadmin.c

View Options

tools/crm_mon.c

View Options

tools/report.collector

View Options

tools/report.common

View Options

xml/Makefile.am

View Options

xml/fencing.rng

View Options

Merge branch 'master' into public39a289bc2f1bActions

Description

Details

Event Timeline

Merged Changes

Changes (85)

rP39a289bc2f1b

.gitignore

GNUmakefile

Makefile.am

configure.ac

crmd/cib.c

crmd/control.c

crmd/election.c

crmd/join_dc.c

crmd/main.c

crmd/te_actions.c

crmd/te_callbacks.c

crmd/te_utils.c

crmd/utils.c

cts/CTStests.py

doc/Clusters_from_Scratch/en-US/Ap-Cman.xml

doc/Clusters_from_Scratch/en-US/Ap-Configuration.txt

doc/Clusters_from_Scratch/en-US/Ap-Configuration.xml

doc/Clusters_from_Scratch/en-US/Ap-Corosync-Conf.txt

doc/Clusters_from_Scratch/en-US/Ap-Corosync-Conf.xml

doc/Clusters_from_Scratch/en-US/Ap-Reading.txt

doc/Clusters_from_Scratch/en-US/Ap-Reading.xml

doc/Clusters_from_Scratch/en-US/Book_Info.xml

doc/Clusters_from_Scratch/en-US/Ch-Active-Active.txt

doc/Clusters_from_Scratch/en-US/Ch-Active-Active.xml

doc/Clusters_from_Scratch/en-US/Ch-Active-Passive.txt

doc/Clusters_from_Scratch/en-US/Ch-Active-Passive.xml

doc/Clusters_from_Scratch/en-US/Ch-Apache.txt

doc/Clusters_from_Scratch/en-US/Ch-Apache.xml

doc/Clusters_from_Scratch/en-US/Ch-Installation.txt

doc/Clusters_from_Scratch/en-US/Ch-Installation.xml

doc/Clusters_from_Scratch/en-US/Ch-Intro.txt

doc/Clusters_from_Scratch/en-US/Ch-Intro.xml

doc/Clusters_from_Scratch/en-US/Ch-Shared-Storage.txt

doc/Clusters_from_Scratch/en-US/Ch-Shared-Storage.xml

doc/Clusters_from_Scratch/en-US/Ch-Stonith.txt

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

doc/Clusters_from_Scratch/en-US/Ch-Tools.txt

doc/Clusters_from_Scratch/en-US/Ch-Tools.xml

doc/Clusters_from_Scratch/en-US/Ch-Verification.txt

doc/Clusters_from_Scratch/en-US/Ch-Verification.xml

doc/Clusters_from_Scratch/en-US/Clusters_from_Scratch.ent

doc/Clusters_from_Scratch/en-US/Revision_History.xml

doc/Makefile.am

doc/Pacemaker_Explained/en-US/Author_Group.xml

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

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

doc/Pacemaker_Explained/en-US/Ch-Options.txt

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

doc/Pacemaker_Explained/en-US/Ch-Utilization.txt

doc/Pacemaker_Explained/en-US/Pacemaker_Explained.xml

doc/publican-clusterlabs/en-US/images/title_logo.svg

extra/cluster-init

fencing/commands.c

fencing/internal.h

fencing/main.c

fencing/remote.c

include/crm/cib.h

include/crm/msg_xml.h

include/crm/pengine/common.h

lib/ais/plugin.c

lib/cib/cib_utils.c

lib/cluster/corosync.c

lib/common/utils.c

lib/fencing/st_client.c

lib/pengine/clone.c

lib/pengine/group.c

lib/pengine/native.c

lib/pengine/unpack.c

lib/pengine/unpack.h

mcp/corosync.c

mcp/pacemaker.c

pengine/graph.c

pengine/native.c

Merge branch 'master' into public
39a289bc2f1b
Actions