Diffusion Pacemaker fc22b96c1a24

Merge branch '2.1' of https://github.com/ClusterLabs/pacemaker into pullback
fc22b96c1a24
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch '2.1' of https://github.com/ClusterLabs/pacemaker into pullback

Resolved one conflict in daemons/attrd/attrd_ipc.c

Details

Provenance

Authored on Nov 22 2022, 1:31 PM

Parents

rP631339ca5aa3: Doc: ChangeLog: update for 2.1.5-rc3 release
rP8998cc0574f5: Merge pull request #2942 from nrwahl2/nrwahl2-T453

Branches

Unknown

Tags

Unknown

Event Timeline

kgaillot committed rPfc22b96c1a24: Merge branch '2.1' of https://github.com/ClusterLabs/pacemaker into pullback (authored by kgaillot).Nov 22 2022, 1:31 PM

Merged Changes

631339ca5aa3 Doc: ChangeLog: update for 2.1.5-rc3 release
Author
kgaillot
Browse Repository
No Audits
6e9a0181bdc1 Merge pull request #2949 from kgaillot/rpm
Author
kgaillot
Browse Repository
No Audits
f251a469440d Merge pull request #2948 from clumens/attrd-ipc-bugs
Author
kgaillot
Browse Repository
No Audits
5df0932ce72e Build: rpm: use correct tarfile name when in source distribution
Author
kgaillot
Browse Repository
No Audits
56a2f7d69df9 Build: rpm: restore ability to build RPMs without a git checkout
Author
kgaillot
Browse Repository
No Audits
962affce1761 Med: libcrmcommon: Wait for ACKs from the attrd clear failure command.
Author
clumens
Browse Repository
No Audits
7c35dcb50054 Med: daemons: Fix expanding ++ and += in multi-update IPC messages.
Author
clumens
Browse Repository
No Audits
981e5351ddd1 Build: release.mk: don't output git errors when setting release variables
Author
kgaillot
Browse Repository
No Audits
7a0ba616a817 Low: daemons: Add host attr to the children of multi-update IPC messages.
Author
clumens
Browse Repository
No Audits
58008d8b83cc Refactor: daemons: Don't copy/free the host attribute.
Author
clumens
Browse Repository
No Audits
142503565669 Med: daemons: Copy all attrs from parent to child in multi-update IPC.
Author
clumens
Browse Repository
No Audits
94a00856f517 Doc: abi-check: bail if not in git checkout
Author
kgaillot
Browse Repository
No Audits
00dc31042074 Merge pull request #2943 from kgaillot/join
Author
kgaillot
Browse Repository
No Audits
fb2df580c6a9 Doc: Pacemaker Development: document the controller join sequence
Author
kgaillot
Browse Repository
No Audits

Changes (9)

Path

Size

daemons/

attrd/

attrd_corosync.c

doc/

sphinx/

Pacemaker_Development/

lib/

common/

mk/

rpm/

pacemaker.spec.in

rPfc22b96c1a24

ChangeLog

Loading...

daemons/attrd/attrd_corosync.c

Loading...

daemons/attrd/attrd_ipc.c

Loading...

doc/abi-check.in

Loading...

doc/sphinx/Pacemaker_Development/components.rst

Loading...

lib/common/ipc_attrd.c

Loading...

mk/release.mk

Loading...

rpm/Makefile.am

Loading...

rpm/pacemaker.spec.in

Loading...