Merge pull request #2208 from clumens/2.0-mergeback-master
60504e067624
Actions

Description

Merge pull request #2208 from clumens/2.0-mergeback-master

Merge 2.0.5 branch back into master

Details

Provenance

kgaillot	Authored on Oct 28 2020, 10:53 AM
GitHub <noreply@github.com>	Committed on Oct 28 2020, 10:53 AM

Parents

rPd2a8c23abc77: Merge branch '2.0' of https://github.com/ClusterLabs/pacemaker
rP4976d06ea0dd: Merge pull request #2197 from clumens/ch11+15

Branches

Tags

Event Timeline

Merged Changes

d2a8c23abc77 Merge branch '2.0' of https://github.com/ClusterLabs/pacemaker
Author
clumens
Browse Repository
No Audits
31aa4f551559 Merge pull request #2207 from clumens/rc2-finishing
Author
clumens
Browse Repository
No Audits
d92b552af911 Doc: ChangeLog: update for 2.0.5-rc2 release.
Author
clumens
Browse Repository
No Audits
978d3557812e Merge pull request #2206 from kgaillot/cve
Author
kgaillot
Browse Repository
No Audits
2bccf968f4eb Refactor: libcrmcommon: move a couple functions to more appropriate source files
Author
kgaillot
Browse Repository
No Audits
e2a1142264c7 Low: pacemakerd: handle shutdown requests better
Author
kgaillot
Browse Repository
No Audits
66a982203a27 Low: daemons,libcrmcommon: send status code with client acks
Author
kgaillot
Browse Repository
No Audits
f7e40da9d32f Doc: Pacemaker Explained: document limitations of ACLs
Author
kgaillot
Browse Repository
No Audits
34cb03a04b57 High: fencer: restrict certain IPC requests to privileged users
Author
kgaillot
Browse Repository
No Audits
83c6d555df9d High: pacemakerd: ignore shutdown requests from unprivileged users
Author
kgaillot
Browse Repository
No Audits
59933b085277 Low: pacemakerd: check client for NULL before using it
Author
kgaillot
Browse Repository
No Audits
73d336c79d07 High: executor: restrict certain IPC requests to Pacemaker daemons
Author
kgaillot
Browse Repository
No Audits
3dbe8e2066d4 Low: executor: return appropriate error code when no remote support
Author
kgaillot
Browse Repository
No Audits
34f936335750 Low: executor: mark controller connections to pacemaker-remoted as privileged
Author
kgaillot
Browse Repository
No Audits
f9705d0b9ba0 Log: executor: show CRM_OP_REGISTER rc in debug message
Author
kgaillot
Browse Repository
No Audits
354625c628f9 Merge pull request #2204 from kgaillot/2.0
Author
kgaillot
Browse Repository
No Audits
dacf285dc26e Fix: tools: revert some changes in crm_resource NULL checks
Author
kgaillot
Browse Repository
No Audits
a29f28adc4b9 Merge pull request #2203 from clumens/schema-optional-2.0
Author
kgaillot
Browse Repository
No Audits
f16863286592 Fix: xml: Mark new crm_mon attributes as optional.
Author
clumens
Browse Repository
No Audits
e190a0f051ef Merge pull request #2202 from clumens/expanded_xml-2.0
Author
kgaillot
Browse Repository
No Audits
01d74ca021ed Fix: scheduler: Remove pe_print_expanded_xml print option.
Author
clumens
Browse Repository
No Audits
53c4fff92c4f Merge pull request #2199 from kgaillot/2.0
Author
kgaillot
Browse Repository
No Audits
40b8f70186b2 Fix: scheduler: fix build when DEFAULT_CONCURRENT_FENCING_TRUE is set
Author
kgaillot
Browse Repository
No Audits
878658661966 Merge pull request #2194 from clumens/rc1-finshing
Author
clumens
Browse Repository
No Audits
787e3669c85c Doc: ChangeLog: update for 2.0.5-rc1 release.
Author
clumens
Browse Repository
No Audits
d213479f1885 Build: update shared object versions for 2.0.5.
Author
clumens
Browse Repository
No Audits
512dd8e89302 Doc: xml: update release/schema version chart for 2.0.5
Author
clumens
Browse Repository
No Audits
cf2690901d99 Build: update version information for 2.0.5.
Author
clumens
Browse Repository
No Audits
6e499d435510 Merge pull request #2195 from kgaillot/2.0
Author
kgaillot
Browse Repository
No Audits
af0347c1e8fe Low: cib: create reply when needed for diff
Author
kgaillot
Browse Repository
No Audits
ab2168c1a17f Fix: cib: only build reply when needed
Author
kgaillot
Browse Repository
No Audits
67558582d12b Refactor: cib: simplify cib_process_request()
Author
kgaillot
Browse Repository
No Audits
8a7b6be61e34 Merge pull request #2193 from clumens/2.0
Author
kgaillot
Browse Repository
No Audits
fe2b05b3a4c4 Merge branch 'master' into 2.0
Author
clumens
Browse Repository
No Audits

Changes (32)

Path

Size

ChangeLog

daemons/

attrd/

based/

controld/

execd/

fenced/

pacemakerd/

schedulerd/

pacemaker-schedulerd.c

doc/

sphinx/

Pacemaker_Explained/

acls.rst

include/

crm/

common/

pengine/

lib/

cib/

cluster/

common/

fencing/

lrmd/

pacemaker/

pengine/

services/

maint/

mocked/

tools/

xml/

api/

rP60504e067624

View Options

ChangeLog

View Options

daemons/attrd/pacemaker-attrd.h

View Options

daemons/based/based_callbacks.c

View Options

daemons/controld/controld_control.c

View Options

daemons/execd/execd_commands.c

View Options

daemons/execd/remoted_tls.c

View Options

daemons/fenced/fenced_commands.c

View Options

daemons/fenced/pacemaker-fenced.c

View Options

daemons/pacemakerd/pacemakerd.c

View Options

daemons/schedulerd/pacemaker-schedulerd.c

View Options

doc/sphinx/Pacemaker_Explained/acls.rst

View Options

include/crm/common/internal.h

View Options

include/crm/common/ipc_internal.h

View Options

include/crm/common/util.h

View Options

include/crm/pengine/common.h

View Options

lib/cib/Makefile.am

View Options

lib/cluster/Makefile.am

View Options

lib/common/Makefile.am

View Options

lib/common/ipc_server.c

View Options

lib/common/messages.c

View Options

lib/common/utils.c

View Options

lib/fencing/Makefile.am

View Options

lib/lrmd/Makefile.am

View Options

lib/pacemaker/Makefile.am

View Options

lib/pengine/Makefile.am

View Options

lib/pengine/status.c

View Options

lib/services/Makefile.am

View Options

maint/mocked/based.c

View Options

tools/crm_resource.c

View Options

version.m4

View Options

xml/Readme.md

View Options

Merge pull request #2208 from clumens/2.0-mergeback-master60504e067624Actions

Description

Details

Event Timeline

Merged Changes

Changes (32)

rP60504e067624

ChangeLog

daemons/attrd/pacemaker-attrd.h

daemons/based/based_callbacks.c

daemons/controld/controld_control.c

daemons/execd/execd_commands.c

daemons/execd/remoted_tls.c

daemons/fenced/fenced_commands.c

daemons/fenced/pacemaker-fenced.c

daemons/pacemakerd/pacemakerd.c

daemons/schedulerd/pacemaker-schedulerd.c

doc/sphinx/Pacemaker_Explained/acls.rst

include/crm/common/internal.h

include/crm/common/ipc_internal.h

include/crm/common/util.h

include/crm/pengine/common.h

lib/cib/Makefile.am

lib/cluster/Makefile.am

lib/common/Makefile.am

lib/common/ipc_server.c

lib/common/messages.c

lib/common/utils.c

lib/fencing/Makefile.am

lib/lrmd/Makefile.am

lib/pacemaker/Makefile.am

lib/pengine/Makefile.am

lib/pengine/status.c

lib/services/Makefile.am

maint/mocked/based.c

tools/crm_resource.c

version.m4

xml/Readme.md

xml/api/crm_mon-2.3.rng

Merge pull request #2208 from clumens/2.0-mergeback-master
60504e067624
Actions