HomeClusterLabs Projects
Diffusion Pacemaker 9978c2c64897

Hg: Automated merge
9978c2c64897
Actions

Description

Hg: Automated merge

Mercurial revision: 46679a8feec7adca2340c6d7ab63353f5f201c1b

Details

Provenance
Andrew Beekhof <andrew@beekhof.net>Authored on Feb 8 2010, 9:41 AM
Parents
rP8a362a4c768c: High: Fencing: Bug bnc#577007 - Correctly parse the hostlist output from…
rPecfd9bfb70a7: Low: extras: HealthSMART: metadata should always work (lf#2269)
Branches
Unknown
Tags
Unknown

Event Timeline

Merged Changes

Changes (228)

PathSize
cib/
cts/
doc/
Pacemaker_Explained/
en-US/
extra/
resources/
shell/
tools/
shell/
tools/

rP9978c2c64897

View Options

GNUmakefile

Loading...
View Options

Makefile.am

Loading...
View Options

cib/callbacks.c

Loading...
View Options

configure.ac

Loading...
View Options

cts/CTStests.py

Loading...
View Options

doc/Makefile.am

Loading...
View Options

doc/Pacemaker_Explained/en-US/Ap-FAQ.xml

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/COPYING

Loading...
View Options

doc/publican-clusterlabs/defaults.cfg

Loading...
View Options

doc/publican-clusterlabs/en-US/Feedback.xml

Loading...
View Options

doc/publican-clusterlabs/en-US/Legal_Notice.xml

Loading...
View Options

doc/publican-clusterlabs/en-US/css/overrides.css

Loading...
View Options

doc/publican-clusterlabs/en-US/images/1.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/10.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/11.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/12.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/13.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/14.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/15.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/16.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/17.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/18.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/19.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/2.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/20.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/21.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/22.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/23.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/24.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/25.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/26.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/27.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/28.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/29.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/3.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/4.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/5.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/6.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/7.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/8.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/9.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/Pacemaker-stack.svg

Loading...
View Options

doc/publican-clusterlabs/en-US/images/dot.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/dot2.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/h1-bg.png

Loading...
View Options

doc/publican-clusterlabs/en-US/images/h1-bg.svg

Loading...
View Options

doc/publican-clusterlabs/en-US/images/image_left.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/image_right.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/important.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/note.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/pacemaker-logo.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/shine.png

Loading...
View Options

doc/publican-clusterlabs/en-US/images/stock-go-back.png

Loading...
View Options

doc/publican-clusterlabs/en-US/images/stock-go-back.svg

Loading...
View Options

doc/publican-clusterlabs/en-US/images/stock-go-forward.png

Loading...
View Options

doc/publican-clusterlabs/en-US/images/stock-go-forward.svg

Loading...
View Options

doc/publican-clusterlabs/en-US/images/stock-go-up.png

Loading...
View Options

doc/publican-clusterlabs/en-US/images/stock-go-up.svg

Loading...
View Options

doc/publican-clusterlabs/en-US/images/stock-home.png

Loading...
View Options

doc/publican-clusterlabs/en-US/images/stock-home.svg

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/warning.png

Loading...
View Options

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

Loading...
View Options

doc/publican-clusterlabs/en-US/images/watermark-draft.png

Loading...
View Options

doc/publican-clusterlabs/en-US/images/watermark-draft.svg

Loading...
View Options

doc/publican-clusterlabs/overrides.cfg

Loading...
View Options

doc/publican-clusterlabs/publican-clusterlabs.spec

Loading...
View Options

doc/publican-clusterlabs/publican.cfg

Loading...
View Options

doc/publican-clusterlabs/xsl/common.xsl

Loading...
View Options

doc/publican-clusterlabs/xsl/html-single.xsl

Loading...
View Options

doc/publican-clusterlabs/xsl/html.xsl

Loading...
View Options

doc/publican-clusterlabs/xsl/pdf.xsl

Loading...
View Options

extra/resources/HealthSMART

Loading...
View Options

extra/resources/ping

Loading...
View Options

pacemaker.spec

Loading...
View Options

shell/Makefile.am

Loading...
View Options

shell/regression/001.exp.xml

Loading...
View Options

shell/regression/001.input

Loading...
View Options

shell/regression/002.exp.xml

Loading...
View Options

shell/regression/002.input

Loading...
View Options

shell/regression/003.exp.xml

Loading...
View Options

shell/regression/003.input

Loading...
View Options

shell/regression/004.exp.xml

Loading...
View Options

shell/regression/004.input

Loading...
View Options

shell/regression/Makefile.am

Loading...
View Options

shell/regression/README.regression

Loading...
View Options

shell/regression/crm-interface

Loading...
View Options

shell/regression/crm_regression.sh

Loading...
View Options

shell/regression/defaults

Loading...
View Options

shell/regression/descriptions

Loading...
View Options

shell/regression/empty.xml

Loading...
View Options

shell/regression/evaltest.sh

Loading...
View Options

shell/regression/lrmregtest-lsb.in

Loading...
View Options

shell/regression/regression.sh.in

Loading...
View Options

shell/regression/shadow.base

Loading...
View Options

shell/regression/testcases/BSC

Loading...
View Options

shell/regression/testcases/Makefile.am

Loading...
View Options

shell/regression/testcases/basicset

Loading...
View Options

shell/regression/testcases/common.excl

Loading...
View Options

shell/regression/testcases/confbasic

Loading...
View Options

shell/regression/testcases/confbasic-xml

Loading...
View Options

shell/regression/testcases/confbasic-xml.exp

Loading...
View Options

shell/regression/testcases/confbasic.exp

Loading...
View Options

shell/regression/testcases/delete

Loading...
View Options

shell/regression/testcases/delete.exp

Loading...
View Options

shell/regression/testcases/file

Loading...
View Options

shell/regression/testcases/file.exp

Loading...
View Options

shell/regression/testcases/node

Loading...
View Options

shell/regression/testcases/node.exp

Loading...
View Options

shell/regression/testcases/ra

Loading...
View Options

shell/regression/testcases/ra.exp

Loading...
View Options

shell/regression/testcases/resource

Loading...
View Options

shell/regression/testcases/resource.exp

Loading...
View Options

shell/regression/testcases/shadow

Loading...
View Options

shell/regression/testcases/shadow.exp

Loading...
View Options

shell/regression/testcases/xmlonly.sh

Loading...
View Options

shell/templates/Makefile.am

Loading...
View Options

shell/templates/apache

Loading...
View Options

shell/templates/clvm

Loading...
View Options

shell/templates/filesystem

Loading...
View Options

shell/templates/gfs2

Loading...
View Options

shell/templates/gfs2-base

Loading...
View Options

shell/templates/ocfs2

Loading...
View Options

shell/templates/virtual-ip

Loading...
View Options

tools/Makefile.am

Loading...
View Options

tools/ccm_epoche.c

Loading...
View Options

tools/crm.in

Loading...
View Options

tools/crm_mon.c

Loading...
View Options

tools/shell/Makefile.am

Loading...
View Options

tools/shell/regression/001.exp.xml

Loading...
View Options

tools/shell/regression/001.input

Loading...
View Options

tools/shell/regression/002.exp.xml

Loading...
View Options

tools/shell/regression/002.input

Loading...
View Options

tools/shell/regression/003.exp.xml

Loading...
View Options

tools/shell/regression/003.input

Loading...
View Options

tools/shell/regression/004.exp.xml

Loading...
View Options

tools/shell/regression/004.input

Loading...
View Options

tools/shell/regression/Makefile.am

Loading...
View Options

tools/shell/regression/README.regression

Loading...
View Options

tools/shell/regression/crm-interface

Loading...
View Options

tools/shell/regression/crm_regression.sh

Loading...
View Options

tools/shell/regression/defaults

Loading...
View Options

tools/shell/regression/descriptions

Loading...
View Options

tools/shell/regression/empty.xml

Loading...
View Options

tools/shell/regression/evaltest.sh

Loading...
View Options

tools/shell/regression/lrmregtest-lsb.in

Loading...
View Options

tools/shell/regression/regression.sh.in

Loading...
View Options

tools/shell/regression/shadow.base

Loading...
View Options

tools/shell/regression/testcases/BSC

Loading...
View Options

tools/shell/regression/testcases/Makefile.am

Loading...
View Options

tools/shell/regression/testcases/basicset

Loading...
View Options

tools/shell/regression/testcases/common.excl

Loading...
View Options

tools/shell/regression/testcases/confbasic

Loading...
View Options

tools/shell/regression/testcases/confbasic-xml

Loading...
View Options

tools/shell/regression/testcases/confbasic-xml.exp

Loading...
View Options

tools/shell/regression/testcases/confbasic.exp

Loading...
View Options

tools/shell/regression/testcases/delete

Loading...
View Options

tools/shell/regression/testcases/delete.exp

Loading...
View Options

tools/shell/regression/testcases/file

Loading...
View Options

tools/shell/regression/testcases/file.exp

Loading...
View Options

tools/shell/regression/testcases/node

Loading...
View Options

tools/shell/regression/testcases/node.exp

Loading...
View Options

tools/shell/regression/testcases/ra

Loading...
View Options

tools/shell/regression/testcases/ra.exp

Loading...
View Options

tools/shell/regression/testcases/resource

Loading...
View Options

tools/shell/regression/testcases/resource.exp

Loading...
View Options

tools/shell/regression/testcases/shadow

Loading...
View Options

tools/shell/regression/testcases/shadow.exp

Loading...
View Options

tools/shell/regression/testcases/xmlonly.sh

Loading...
View Options

tools/shell/templates/Makefile.am

Loading...
View Options

tools/shell/templates/apache

Loading...
View Options

tools/shell/templates/clvm

Loading...
View Options

tools/shell/templates/filesystem

Loading...
View Options

tools/shell/templates/gfs2

Loading...
View Options

tools/shell/templates/gfs2-base

Loading...
View Options

tools/shell/templates/ocfs2

Loading...
View Options

tools/shell/templates/virtual-ip

Loading...