Merge pull request #3100 from kgaillot/pullback
d4130388da38
Actions

Description

Merge pull request #3100 from kgaillot/pullback

Pull 2.1.6-rc2 back into main branch

Details

Provenance

kgaillot	Authored on May 2 2023, 7:30 PM
GitHub <noreply@github.com>	Committed on May 2 2023, 7:30 PM

Parents

rP336efa1a29f0: Merge branch '2.1' of https://github.com/ClusterLabs/pacemaker into pullback
rP039ba785185b: Merge pull request #3089 from waltdisgrace/t563

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed rPd4130388da38: Merge pull request #3100 from kgaillot/pullback (authored by kgaillot).May 2 2023, 7:30 PM

Merged Changes

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

336efa1a29f0 Merge branch '2.1' of https://github.com/ClusterLabs/pacemaker into pullback
Author
kgaillot
Browse Repository
No Audits
802a72226be8 Doc: ChangeLog: update for 2.1.6-rc2 release
Author
kgaillot
Browse Repository
No Audits
7ad038daa22f Merge pull request #3092 from kgaillot/T217
Author
kgaillot
Browse Repository
No Audits
2cc0c2b42312 Merge pull request #3096 from wenningerk/spec_issues_2.1
Author
kgaillot
Browse Repository
No Audits
ae432a63b09f Build: rpm: avoid bare wildcards under shared directories in spec
Author
wenningerk
Browse Repository
No Audits
6bcb0ad9b08c Build: rpm: convert licenses to SPDX
Author
wenningerk
Browse Repository
No Audits
832463d94cd6 Merge pull request #3095 from clumens/pacemakerd-timeout
Author
kgaillot
Browse Repository
No Audits
6ec6bac351b4 Low: daemons: pacemakerd -S should wait for shutdown before returning
Author
clumens
Browse Repository
No Audits
b049bbeea136 Merge pull request #3091 from kgaillot/release
Author
kgaillot
Browse Repository
No Audits
04f4c764bc97 Test: cts-scheduler: update tests for colocation change
Author
kgaillot
Browse Repository
No Audits
0eae7d53b428 Fix: scheduler: consider mandatory colocations before optional
Author
kgaillot
Browse Repository
No Audits
2b28d8708090 Refactor: scheduler: avoid duplication of applying dependent scores
Author
kgaillot
Browse Repository
No Audits
a28de2b8d79c Feature: scheduler: deprecate support for Nagios resources
Author
kgaillot
Browse Repository
No Audits
69aa8745fd4a Doc: Pacemaker Explained: move Upstart to end of class list
Author
kgaillot
Browse Repository
No Audits
8b3e81c90f8e Log: scheduler: warn if Upstart resources are used
Author
kgaillot
Browse Repository
No Audits
1d5438d7cf50 API: libcrmservice: deprecate enum nagios_exitcode
Author
kgaillot
Browse Repository
No Audits
ec3216554ebf API: libcrmcommon: deprecate PCMK_RESOURCE_CLASS_UPSTART
Author
kgaillot
Browse Repository
No Audits
9c40d3512508 API: libcrmcommon: deprecate PCMK_RESOURCE_CLASS_NAGIOS
Author
kgaillot
Browse Repository
No Audits
4c1502dbc8b9 Doc: Pacemaker Explained: document when certain features were added
Author
kgaillot
Browse Repository
No Audits
283ab70792bf Feature: scheduler: deprecate "moon" in date_spec elements in rules
Author
kgaillot
Browse Repository
No Audits
bb6f37b37a86 Merge pull request #3088 from clumens/preserve-transients-2.1
Author
kgaillot
Browse Repository
No Audits
09058c943952 Feature: daemons: Preserve transient attrs when possible
Author
clumens
Browse Repository
No Audits
060b05f73993 Feature: daemons: Sync remote connection info with new controllers.
Author
clumens
Browse Repository
No Audits
9b10e363d0c2 Feature: daemons: Record the node hosting a remote connection resource.
Author
clumens
Browse Repository
No Audits
6a1b27864dac Feature: daemons: Add node hosting connection resource to state XML.
Author
clumens
Browse Repository
No Audits
e503acb82f93 Refactor: daemons: Broadcast remote node state changes to all controllers
Author
clumens
Browse Repository
No Audits
6127934e380e Merge pull request #3082 from gao-yan/fencing-delays-timeouts
Author
kgaillot
Browse Repository
No Audits
784479f923fa Feature: liblrmd: Add a function to extract lrmd uptime.
Author
clumens
Browse Repository
No Audits
30efb62f3df2 Feature: daemons: Add daemon uptime to execd XML replies.
Author
clumens
Browse Repository
No Audits
e34de5924a88 API: libcrmcluster: Record the time when a peer is lost.
Author
clumens
Browse Repository
No Audits
ccc3b3344a1d Merge pull request #3087 from clumens/cts-default-2.1
Author
kgaillot
Browse Repository
No Audits
3da0ca4c8e19 Low: python: Default CTS iterations to 1.
Author
clumens
Browse Repository
No Audits
65a938c2e24d Fix: fencer: fencing timeout sent to peer takes no delay into account
Author
gao-yan
Browse Repository
No Audits
558634016f48 Fix: libpacemaker: initial timeout for fencing callback takes any requested…
Author
gao-yan
Browse Repository
No Audits
48a8997cbfeb Log: controller: use "target" terminology consistently
Author
gao-yan
Browse Repository
No Audits
469b203462dc Log: controller: log fencing timeout consistently in seconds as priority…
Author
gao-yan
Browse Repository
No Audits
db32a9c43462 Fix: controller: initial timeout for fencing callback takes any priority…
Author
gao-yan
Browse Repository
No Audits
dd563f995708 Fix: fencer: apply requested fencing delay only for the first device
Author
gao-yan
Browse Repository
No Audits
d2123dac8491 Fix: fencer: fencing timeouts take any pcmk_delay_base into account
Author
gao-yan
Browse Repository
No Audits
a6eef3007607 Fix: fencer: add correct values of pcmk_delay_base/max to query rely
Author
gao-yan
Browse Repository
No Audits
86de9621e22b Fix: fencer: per-operation fencing timeout takes any requested fencing delay…
Author
gao-yan
Browse Repository
No Audits
cdbfab0858f9 Fix: fencer: total fencing timeout takes any requested fencing delay into…
Author
gao-yan
Browse Repository
No Audits
8a1b3d608e54 Test: cts-fencing: regression test for fencing timeouts taking fencing delays…
Author
gao-yan
Browse Repository
No Audits
095c09eee68f Doc: ChangeLog: update for 2.1.6-rc1 release
Author
kgaillot
Browse Repository
No Audits
d3e902313822 Build: update version information for 2.1.6
Author
kgaillot
Browse Repository
No Audits
606c53f96a8c Build: libraries: update shared object versions for 2.1.6
Author
kgaillot
Browse Repository
No Audits
add6b15e24ee Merge pull request #3079 from kgaillot/release
Author
kgaillot
Browse Repository
No Audits
a724037398b4 Merge pull request #3081 from clumens/fosa-2.1
Author
kgaillot
Browse Repository
No Audits
dc0b09aea856 Low: NLS: update translations for current code base
Author
kgaillot
Browse Repository
No Audits
19553949f34b Test: scheduler: update summary outputs without --enable-compat-2.0
Author
kgaillot
Browse Repository
No Audits

Changes (45)

Path

Size

cts/

lab/

scheduler/

dot/

group-anticolocation.dot

exp/

group-anticolocation.exp

scores/

clone-anon-failcount.scores

group-anticolocation.scores

summary/

group-anticolocation.summary

daemons/

controld/

controld_callbacks.c

controld_fencing.c

controld_join_client.c

execd/

fenced/

pacemakerd/

doc/

sphinx/

Pacemaker_Explained/

alerts.rst

resources.rst

rules.rst

include/

crm/

common/

pengine/

lib/

cluster/

membership.c

lrmd/

lrmd_client.c

pacemaker/

libpacemaker_private.h

pcmk_fence.c

pcmk_sched_clone.c

pcmk_sched_colocation.c

pcmk_sched_primitive.c

pengine/

complex.c

rules.c

python/

pacemaker/

_cts/

environment.py

patterns.py

rpm/

pacemaker.spec.in

rPd4130388da38

View Options

ChangeLog

View Options

configure.ac

View Options

cts/cts-fencing.in

View Options

cts/lab/CTSlab.py.in

View Options

cts/lab/CTStests.py

View Options

cts/scheduler/dot/group-anticolocation.dot

View Options

cts/scheduler/exp/group-anticolocation.exp

View Options

cts/scheduler/scores/clone-anon-failcount.scores

View Options

cts/scheduler/scores/group-anticolocation.scores

View Options

cts/scheduler/summary/group-anticolocation.summary

View Options

daemons/controld/controld_callbacks.c

View Options

daemons/controld/controld_fencing.c

View Options

daemons/controld/controld_join_client.c

View Options

daemons/controld/controld_join_dc.c

View Options

daemons/controld/controld_messages.c

View Options

daemons/controld/controld_messages.h

View Options

daemons/controld/controld_remote_ra.c

View Options

daemons/execd/execd_commands.c

View Options

daemons/execd/pacemaker-execd.c

View Options

daemons/execd/pacemaker-execd.h

View Options

daemons/fenced/fenced_commands.c

View Options

daemons/fenced/fenced_remote.c

View Options

daemons/pacemakerd/pacemakerd.c

View Options

doc/sphinx/Pacemaker_Explained/alerts.rst

View Options

doc/sphinx/Pacemaker_Explained/resources.rst

View Options

doc/sphinx/Pacemaker_Explained/rules.rst

View Options

include/crm/cluster.h

View Options

include/crm/common/agents.h

View Options

include/crm/common/ipc_internal.h

View Options

include/crm/lrmd_internal.h

View Options

include/crm/pengine/internal.h

View Options

include/crm/services.h

View Options

include/crm_internal.h

View Options

lib/cluster/membership.c

View Options

lib/lrmd/lrmd_client.c

View Options

lib/pacemaker/libpacemaker_private.h

View Options

lib/pacemaker/pcmk_fence.c

View Options

lib/pacemaker/pcmk_sched_clone.c

View Options

lib/pacemaker/pcmk_sched_colocation.c

View Options

lib/pacemaker/pcmk_sched_primitive.c

View Options

lib/pengine/complex.c

View Options

lib/pengine/rules.c

View Options

python/pacemaker/_cts/environment.py

View Options

python/pacemaker/_cts/patterns.py

View Options

Merge pull request #3100 from kgaillot/pullbackd4130388da38Actions

Description

Details

Event Timeline

Merged Changes

Changes (45)

rPd4130388da38

ChangeLog

configure.ac

cts/cts-fencing.in

cts/lab/CTSlab.py.in

cts/lab/CTStests.py

cts/scheduler/dot/group-anticolocation.dot

cts/scheduler/exp/group-anticolocation.exp

cts/scheduler/scores/clone-anon-failcount.scores

cts/scheduler/scores/group-anticolocation.scores

cts/scheduler/summary/group-anticolocation.summary

daemons/controld/controld_callbacks.c

daemons/controld/controld_fencing.c

daemons/controld/controld_join_client.c

daemons/controld/controld_join_dc.c

daemons/controld/controld_messages.c

daemons/controld/controld_messages.h

daemons/controld/controld_remote_ra.c

daemons/execd/execd_commands.c

daemons/execd/pacemaker-execd.c

daemons/execd/pacemaker-execd.h

daemons/fenced/fenced_commands.c

daemons/fenced/fenced_remote.c

daemons/pacemakerd/pacemakerd.c

doc/sphinx/Pacemaker_Explained/alerts.rst

doc/sphinx/Pacemaker_Explained/resources.rst

doc/sphinx/Pacemaker_Explained/rules.rst

include/crm/cluster.h

include/crm/common/agents.h

include/crm/common/ipc_internal.h

include/crm/lrmd_internal.h

include/crm/pengine/internal.h

include/crm/services.h

include/crm_internal.h

lib/cluster/membership.c

lib/lrmd/lrmd_client.c

lib/pacemaker/libpacemaker_private.h

lib/pacemaker/pcmk_fence.c

lib/pacemaker/pcmk_sched_clone.c

lib/pacemaker/pcmk_sched_colocation.c

lib/pacemaker/pcmk_sched_primitive.c

lib/pengine/complex.c

lib/pengine/rules.c

python/pacemaker/_cts/environment.py

python/pacemaker/_cts/patterns.py

rpm/pacemaker.spec.in

Merge pull request #3100 from kgaillot/pullback
d4130388da38
Actions