Merge pull request #1524 from kgaillot/master
2b574985d3fc
Actions

Description

Merge pull request #1524 from kgaillot/master

Pull 2.0.0-rc6 into master branch

Details

Provenance

kgaillot	Authored on Jun 26 2018, 11:28 PM
GitHub <noreply@github.com>	Committed on Jun 26 2018, 11:28 PM

Parents

rPd756c8bf7c28: Merge branch '2.0' of https://github.com/ClusterLabs/pacemaker
rP82afc25c553a: Merge pull request #1499 from ClusterLabs/2.0

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

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

d756c8bf7c28 Merge branch '2.0' of https://github.com/ClusterLabs/pacemaker
Author
kgaillot
Browse Repository
No Audits
55f559456c9e Merge pull request #1518 from kgaillot/changes20
Author
kgaillot
Browse Repository
No Audits
7161a30b1861 Doc: update change log for 2.0.0-rc6 release
Author
kgaillot
Browse Repository
No Audits
8c9971ab8e9b Build: update shared object versions for 2.0.0 final release
Author
kgaillot
Browse Repository
No Audits
a45945f166cc Build: ChangeLog: don't add "source tarball" line
Author
kgaillot
Browse Repository
No Audits
b895b957af56 Refactor: libcrmcluster: reorganize crm_node_t structure
Author
kgaillot
Browse Repository
No Audits
98657bd354c7 Test: cts-cli: update upgrade expected output and ignore line numbers
Author
kgaillot
Browse Repository
No Audits
28e4b0f82c04 Test: cts-cli: distribute upgrade regression data
Author
kgaillot
Browse Repository
No Audits
fa61803965d9 Doc: CTS: replace "cib" with "pacemaker-based" in README
Author
kgaillot
Browse Repository
No Audits
0b2211069c80 Test: CTS: remove vestiges of former valgrind options
Author
kgaillot
Browse Repository
No Audits
e3140eea6f64 Test: cts-exec: don't reload systemd
Author
kgaillot
Browse Repository
No Audits
330a400fe2c5 Test: cts-exec,cts-support: have cts-support manage Upstart dummy service
Author
kgaillot
Browse Repository
No Audits
9373715df920 Test: CTS,cts-exec,cts-support: have cts-support manage LSBDummy
Author
kgaillot
Browse Repository
No Audits
302e18ef568f Test: CTS: cts-support should try removing file only if it exists
Author
kgaillot
Browse Repository
No Audits
ae701ce6cb01 Doc: tools: stonith_admin -h/-H options are queries
Author
kgaillot
Browse Repository
No Audits
15dc9c18302c Low: libstonithd: avoid memory leak when getting meta-data
Author
kgaillot
Browse Repository
No Audits
ee2e5ec88aed Merge pull request #1500 from jnpkrn/upgrade-xsl-2to3-part7
Author
kgaillot
Browse Repository
No Audits
38a7c5df7c01 Test: travis: build up a test matrix incl. no-compile item; cleanup
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
b24ca8dbca0e XML: resources-3.1.rng: relaxed schema after tight upgrade enforcement
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
16eeb6882176 XML: schemas.c: take severities of XSLT messages into account properly
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
ef37260701af XML: assets/upgrade-2.10-htmldiff.xsl: express message severity visually
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
b858500510ee XML: upgrade-2.10{,-leave}.rng: distinguish message severity
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
156371675059 Doc: xml: background + explanation wrt. enter/leave aux. transformations
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
7636be727c25 Build: xml: *.rng: ship needed non-generated (& only such) RNG schemas
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
fb30422a9053 Build: xml: upgrade-*.xsl: ship run-time used (& only such) stylesheets
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
2a9120e9e4ef XML: upgrade-2.10-roundtrip.xsl et al.: new tests incl. browser view
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
ab3e1ef0e608 Test: cts-cli: new "upgrade" subtest justifying unfold-upgrade-refold
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
b8e6323e107b XML: upgrade-2.10.xsl: simplify thanks to diehard assumptions wrt. input
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
7a0cdce980ff XML: upgrade-2.10-leave.xsl: post-upgrade output restoring stylesheet
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
9e845f9b2f10 XML: upgrade-2.10-enter.xsl: pre-upgrade input normalizing stylesheet
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
1cf98602fd10 XML: regression.sh: test_{runner,selfcheck}: generalize beyond upgrade
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
cec09dda3f2b XML: regression.sh: more informative output for -D on content match
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
cf240440f640 XML: regression.sh: some unification and cleanup (e.g. missing comments)
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
d687280a4917 XML: schemas.c: implement & employ full round-trip apply_upgrade
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
9aa4bc72db23 XML: schemas.c: switch to using add_schema_by_version
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
e535c3f4d522 XML: schemas.c: prepare the ground for unfold-transform-refold logic
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
1fc4a3ee23e9 XML: schemas.c: crm_schema_init: simplify for/break, call add_schema 1x
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
9ac70aa6bcf7 XML: schemas.c: shortcut upgrade transformation when not needed
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
b502c3c8a9fd Refactor: schemas.c: remove superfluous branching (after 6d1fbc7a7)
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
78ac6a0d040b Codedoc: fix typos and cleanup crm/common/xml.h:update_validation
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
1aead0acdabc Merge pull request #1520 from wenningerk/crm_mon_add_fence_history_2.0
Author
kgaillot
Browse Repository
No Audits
03bc87094b48 Fix: st_client, stonith_admin: cleanup memory of stonith-history
Author
wenningerk
Browse Repository
No Audits
b26c3a90201e Merge pull request #1519 from jnpkrn/XML-related-logging
Author
kgaillot
Browse Repository
No Audits
cdb5a2544a1e XML: cib_ops.c: make use of cib_verbose flag for RNG/XSLT handling
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
cd7145033919 XML: xml_internal.h: accept changing priority over particular chunks
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
a5f5c4b9ae90 Merge pull request #1511 from jnpkrn/cib_id-ref
Author
kgaillot
Browse Repository
No Audits
7056e7211aa6 High: CIB: no schema violating oversimplified patching with @id-ref
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
75fc6a81a55e Refactor: xml.c: add new find_entity_by_id_or_just_name generalization
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits
6122b7f1d3c4 Merge pull request #1516 from jnpkrn/cib_xslt-cleanup
Author
kgaillot
Browse Repository
No Audits
4f4649c52cf3 Med: schemas.c: cleanup XSLT extension modules' data and whatnot
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits

Changes (125)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

Path

Size

cts/

cli/

regression.upgrade.exp

regression.validity.exp

pacemaker-cts-dummyd.conf

watcher.py

daemons/

attrd/

attrd_commands.c

based/

based_callbacks.c

controld/

controld_execd_state.c

fenced/

schedulerd/

include/

crm/

common/

fencing/

pengine/

lib/

cib/

cluster/

common/

fencing/

lrmd/

pengine/

services/

transition/

tools/

xml/

assets/

upgrade-2.10-htmldiff.xsl

cibtr-2.rng

regression.sh

resources-3.0.rng

	resources-3.1.rng
	resources-3.0.rng

test-2-enter

010-clu-props.ref

010-clu-props.ref.err

010-clu-props.xml

020-instance_atributes-rsc.ref

020-instance_atributes-rsc.ref.err

020-instance_atributes-rsc.xml

021-instance_atributes-rsc-nonbijective.ref

021-instance_atributes-rsc-nonbijective.ref.err

021-instance_atributes-rsc-nonbijective.xml

test-2-leave

010-clu-props-can.ref

010-clu-props-can.ref.err

010-clu-props-can.xml

011-clu-props-cannot.ref

011-clu-props-cannot.ref.err

011-clu-props-cannot.xml

021-instance_atributes-rsc-nonbijective.ref

021-instance_atributes-rsc-nonbijective.ref.err

021-instance_atributes-rsc-nonbijective.xml

test-2-roundtrip

021-instance_atributes-rsc-nonbijective.ref

021-instance_atributes-rsc-nonbijective.ref.err

021-instance_atributes-rsc-nonbijective.xml

test-2/

010-rsc_colocation-dropped-for-noop-sa.ref.err

020-rsc-requires-inline.ref.err

021-rsc-requires-nvpair.ref.err

022-rsc-requires-counterexamples.ref.err

023-rsc-requires-no-override.ref.err

024-rsc-requires-no-selfclash.ref.err

030-clu-props-plain-rename.ref.err

031-clu-props-drop.ref.err

032-clu-props-move.ref.err

033-clu-props-move-merge.ref.err

034-clu-props-move-redef.ref.err

040-nodes-rename-type.ref.err

050-rsc-attrs-instance-plain-rename.ref.err

051-rsc-attrs-instance-pcmk_arg_map.ref.err

060-rsc-attrs-meta-isolation.ref.err

061-rsc-attrs-meta-exchange.ref.err

070-rsc-op-attrs-inst-requires-start.ref.err

071-rsc-op-attrs-inst-requires-nonstart.ref.err

072-rsc-op-attrs-inst-requires-no-override.ref.err

073-rsc-op-attrs-inst-meta-meaning.ref.err

upgrade-2.10-enter.xsl

upgrade-2.10-leave.xsl

upgrade-2.10-roundtrip.xsl

upgrade-2.10.xsl

rP2b574985d3fc

View Options

.gitignore

Load File

View Options

.travis.yml

Load File

View Options

ChangeLog

Load File

View Options

GNUmakefile

Load File

View Options

configure.ac

Load File

View Options

cts/CIB.py

Load File

View Options

cts/CM_common.py

Load File

View Options

cts/CTS.py.in

Load File

View Options

cts/CTSscenarios.py

Load File

View Options

cts/CTStests.py

Load File

View Options

cts/Makefile.am

Load File

View Options

cts/README.md

Load File

View Options

cts/cli/regression.upgrade.exp

Load File

View Options

cts/cli/regression.validity.exp

Load File

View Options

cts/cts-cli.in

Load File

View Options

cts/cts-exec.in

Load File

View Options

cts/cts-support.in

Load File

View Options

cts/cts.supp

Load File

View Options

cts/environment.py

Load File

View Options

cts/pacemaker-cts-dummyd.conf

Load File

View Options

cts/watcher.py

Load File

View Options

daemons/attrd/attrd_commands.c

Load File

View Options

daemons/based/based_callbacks.c

Load File

View Options

daemons/controld/controld_execd_state.c

Load File

View Options

daemons/controld/controld_messages.c

Load File

View Options

daemons/fenced/pacemaker-fenced.c

Load File

View Options

daemons/schedulerd/Makefile.am

Load File

View Options

daemons/schedulerd/sched_allocate.c

Load File

View Options

daemons/schedulerd/sched_promotable.c

Load File

View Options

include/crm/cib.h

Load File

View Options

include/crm/cluster.h

Load File

View Options

include/crm/common/cib_secrets.h

Load File

View Options

include/crm/common/util.h

Load File

View Options

include/crm/common/xml.h

Load File

View Options

include/crm/common/xml_internal.h

Load File

View Options

include/crm/crm.h

Load File

View Options

include/crm/fencing/internal.h

Load File

View Options

include/crm/msg_xml.h

Load File

View Options

include/crm/pengine/status.h

Load File

View Options

include/crm/stonith-ng.h

Load File

View Options

lib/cib/Makefile.am

Load File

View Options

lib/cib/cib_ops.c

Load File

View Options

lib/cluster/Makefile.am

Load File

View Options

lib/cluster/cluster.c

Load File

View Options

lib/cluster/cpg.c

Load File

View Options

lib/cluster/membership.c

Load File

View Options

lib/common/Makefile.am

Load File

View Options

lib/common/cib_secrets.c

Load File

View Options

lib/common/ipc.c

Load File

View Options

lib/common/schemas.c

Load File

View Options

lib/common/utils.c

Load File

View Options

lib/common/xml.c

Load File

View Options

lib/fencing/Makefile.am

Load File

View Options

lib/fencing/st_client.c

Load File

View Options

lib/fencing/st_lha.c

Load File

View Options

lib/fencing/st_rhcs.c

Load File

View Options

lib/lrmd/Makefile.am

Load File

View Options

lib/pengine/Makefile.am

Load File

View Options

lib/pengine/utils.c

Load File

View Options

lib/services/Makefile.am

Load File

View Options

lib/services/systemd.c

Load File

View Options

lib/transition/Makefile.am

Load File

View Options

pacemaker.spec.in

Load File

View Options

tools/Makefile.am

Load File

View Options

tools/crm_failcount.in

Load File

View Options

tools/crm_node.c

Load File

View Options

tools/crm_simulate.c

Load File

View Options

tools/crmadmin.c

Load File

View Options

tools/report.common.in

Load File

View Options

tools/stonith_admin.c

Load File

View Options

xml/Makefile.am

Load File

View Options

xml/Readme.md

Load File

View Options

xml/assets/upgrade-2.10-htmldiff.xsl

Load File

View Options

xml/cibtr-2.rng

Load File

View Options

xml/regression.sh

Load File

View Options

xml/resources-3.0.rng

Load File

View Options

xml/resources-3.1.rng

Load File

View Options

xml/test-2-enter/010-clu-props.ref

Load File

View Options

xml/test-2-enter/010-clu-props.ref.err

Load File

View Options

xml/test-2-enter/010-clu-props.xml

Load File

View Options

xml/test-2-enter/020-instance_atributes-rsc.ref

Load File

View Options

xml/test-2-enter/020-instance_atributes-rsc.ref.err

Load File

View Options

xml/test-2-enter/020-instance_atributes-rsc.xml

Load File

View Options

xml/test-2-enter/021-instance_atributes-rsc-nonbijective.ref

Load File

View Options

xml/test-2-enter/021-instance_atributes-rsc-nonbijective.ref.err

Load File

View Options

xml/test-2-enter/021-instance_atributes-rsc-nonbijective.xml

Load File

View Options

xml/test-2-leave/010-clu-props-can.ref

Load File

View Options

xml/test-2-leave/010-clu-props-can.ref.err

Load File

View Options

xml/test-2-leave/010-clu-props-can.xml

Load File

View Options

xml/test-2-leave/011-clu-props-cannot.ref

Load File

View Options

xml/test-2-leave/011-clu-props-cannot.ref.err

Load File

View Options

xml/test-2-leave/011-clu-props-cannot.xml

Load File

View Options

xml/test-2-leave/021-instance_atributes-rsc-nonbijective.ref

Load File

View Options

xml/test-2-leave/021-instance_atributes-rsc-nonbijective.ref.err

Load File

View Options

xml/test-2-leave/021-instance_atributes-rsc-nonbijective.xml

Load File

View Options

xml/test-2-roundtrip/021-instance_atributes-rsc-nonbijective.ref

Load File

View Options

xml/test-2-roundtrip/021-instance_atributes-rsc-nonbijective.ref.err

Load File

View Options

xml/test-2-roundtrip/021-instance_atributes-rsc-nonbijective.xml

Load File

View Options

xml/test-2/010-rsc_colocation-dropped-for-noop-sa.ref.err

Load File

View Options

xml/test-2/020-rsc-requires-inline.ref.err

Load File

View Options

xml/test-2/021-rsc-requires-nvpair.ref.err

Load File

View Options

xml/test-2/022-rsc-requires-counterexamples.ref.err

Load File

View Options

xml/test-2/023-rsc-requires-no-override.ref.err

Load File

View Options

xml/test-2/024-rsc-requires-no-selfclash.ref.err

Load File

View Options

xml/test-2/030-clu-props-plain-rename.ref.err

Load File

View Options

xml/test-2/031-clu-props-drop.ref.err

Load File

View Options

xml/test-2/032-clu-props-move.ref.err

Load File

View Options

xml/test-2/033-clu-props-move-merge.ref.err

Load File

View Options

xml/test-2/034-clu-props-move-redef.ref.err

Load File

View Options

xml/test-2/040-nodes-rename-type.ref.err

Load File

View Options

xml/test-2/050-rsc-attrs-instance-plain-rename.ref.err

Load File

View Options

xml/test-2/051-rsc-attrs-instance-pcmk_arg_map.ref.err

Load File

View Options

xml/test-2/060-rsc-attrs-meta-isolation.ref.err

Load File

View Options

xml/test-2/061-rsc-attrs-meta-exchange.ref.err

Load File

View Options

xml/test-2/070-rsc-op-attrs-inst-requires-start.ref.err

Load File

View Options

xml/test-2/071-rsc-op-attrs-inst-requires-nonstart.ref.err

Load File

View Options

xml/test-2/072-rsc-op-attrs-inst-requires-no-override.ref.err

Load File

View Options

xml/test-2/073-rsc-op-attrs-inst-meta-meaning.ref.err

Load File

View Options

xml/upgrade-2.10-enter.xsl

Load File

View Options

xml/upgrade-2.10-leave.xsl

Load File

View Options

xml/upgrade-2.10-roundtrip.xsl

Load File

View Options

xml/upgrade-2.10.xsl

Load File

Merge pull request #1524 from kgaillot/master2b574985d3fcActions

Description

Details

Event Timeline

Merged Changes

Changes (125)Show All Changes

Very Large Commit

rP2b574985d3fc

.gitignore

.travis.yml

ChangeLog

GNUmakefile

configure.ac

cts/CIB.py

cts/CM_common.py

cts/CTS.py.in

cts/CTSscenarios.py

cts/CTStests.py

cts/Makefile.am

cts/README.md

cts/cli/regression.upgrade.exp

cts/cli/regression.validity.exp

cts/cts-cli.in

cts/cts-exec.in

cts/cts-support.in

cts/cts.supp

cts/environment.py

cts/pacemaker-cts-dummyd.conf

cts/watcher.py

daemons/attrd/attrd_commands.c

daemons/based/based_callbacks.c

daemons/controld/controld_execd_state.c

daemons/controld/controld_messages.c

daemons/fenced/pacemaker-fenced.c

daemons/schedulerd/Makefile.am

daemons/schedulerd/sched_allocate.c

daemons/schedulerd/sched_promotable.c

include/crm/cib.h

include/crm/cluster.h

include/crm/common/cib_secrets.h

include/crm/common/util.h

include/crm/common/xml.h

include/crm/common/xml_internal.h

include/crm/crm.h

include/crm/fencing/internal.h

include/crm/msg_xml.h

include/crm/pengine/status.h

include/crm/stonith-ng.h

lib/cib/Makefile.am

lib/cib/cib_ops.c

lib/cluster/Makefile.am

lib/cluster/cluster.c

lib/cluster/cpg.c

lib/cluster/membership.c

lib/common/Makefile.am

lib/common/cib_secrets.c

lib/common/ipc.c

lib/common/schemas.c

lib/common/utils.c

lib/common/xml.c

lib/fencing/Makefile.am

lib/fencing/st_client.c

lib/fencing/st_lha.c

lib/fencing/st_rhcs.c

lib/lrmd/Makefile.am

lib/pengine/Makefile.am

lib/pengine/utils.c

lib/services/Makefile.am

lib/services/systemd.c

lib/transition/Makefile.am

pacemaker.spec.in

tools/Makefile.am

tools/crm_failcount.in

tools/crm_node.c

tools/crm_simulate.c

tools/crmadmin.c

tools/report.common.in

tools/stonith_admin.c

xml/Makefile.am

xml/Readme.md

Merge pull request #1524 from kgaillot/master
2b574985d3fc
Actions

Changes (125)
Show All Changes