Diffusion Pacemaker 06229e9a33f3

Merge branch 'master' of github.com:ClusterLabs/pacemaker
06229e9a33f3
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'master' of github.com:ClusterLabs/pacemaker

Conflicts:
fencing/main.c

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on Oct 30 2012, 11:35 PM

Parents

rP991a36eda5d8: Merge pull request #176 from gao-yan/obsolete-lrm-resource
rPdd94186f0b8c: Low: Tools: Allow cibadmin --xpath queries to format the results as XPath…

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

991a36eda5d8 Merge pull request #176 from gao-yan/obsolete-lrm-resource
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
d4068925a2da Merge pull request #177 from gao-yan/ptest-fix-build
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
5cffdde8649c Merge pull request #178 from davidvossel/cts-fixes
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
d48a1818efcb Low: fencing: Downgrade cib disconnect error msg to notice message since it…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
069c848d3521 Low: cts: Make sure fencing level id always starts with a letter.
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
c9ff7d3bd3e7 Low: Tools: ptest - Fix for being able to be built with latest code
Author
gao-yan
Browse Repository
No Audits
e53735b78a55 Low: PE: cl#5115 - Do not use obsolete lrm_resource sections to avoid fatal…
Author
gao-yan
Browse Repository
No Audits
87855b980771 Medium: PE: cl#5115 - Do not use obsolete lrm_resource sections to avoid fatal…
Author
gao-yan
Browse Repository
No Audits
b0fda891dd55 Merge pull request #175 from davidvossel/master
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
5f2998a1c574 Low: fencing: Fixes issue with param list in standalone config
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits

Changes (11)

Path

Size

cts/

fencing/

standalone_config.c

lib/

pengine/

pengine/

test10/

obsolete-lrm-resource.dot

obsolete-lrm-resource.exp

obsolete-lrm-resource.scores

obsolete-lrm-resource.summary

obsolete-lrm-resource.xml

rP06229e9a33f3

cts/CIB.py

Loading...

fencing/main.c

Loading...

fencing/standalone_config.c

Loading...

lib/pengine/unpack.c

Loading...

pengine/ptest.c

Loading...

pengine/regression.sh

Loading...

pengine/test10/obsolete-lrm-resource.dot

Loading...

pengine/test10/obsolete-lrm-resource.exp

Loading...

pengine/test10/obsolete-lrm-resource.scores

Loading...

pengine/test10/obsolete-lrm-resource.summary

Loading...

pengine/test10/obsolete-lrm-resource.xml

Loading...