Merge pull request #2053 from wenningerk/2.0-mergeback-master
4c968ed7a976
Actions

Description

Merge pull request #2053 from wenningerk/2.0-mergeback-master

merge 2.0.4-rc1 changes back into master except 2 temporarily reverted commits from PR#2036

Details

Provenance

kgaillot	Authored on May 1 2020, 3:25 PM
GitHub <noreply@github.com>	Committed on May 1 2020, 3:25 PM

Parents

rP0eac21faf2a8: Doc: ChangeLog: update for 2.0.4-rc1 release
rP42ba94958583: Merge pull request #2052 from kgaillot/doc

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

0eac21faf2a8 Doc: ChangeLog: update for 2.0.4-rc1 release
Author
wenningerk
Browse Repository
No Audits
063f44d7786a Doc: books: update revision-history for 2.0.4
Author
wenningerk
Browse Repository
No Audits
53f25d70c873 Build: bump versions for 2.0.4 in version.m4 and libs
Author
wenningerk
Browse Repository
No Audits
c23feefb1b2b Doc: inkscape: export-file changed to export-filename in 1.0rc1
Author
wenningerk
Browse Repository
No Audits
0295711448f6 Merge pull request #2049 from gao-yan/fencing-delay-fixes
Author
wenningerk
Browse Repository
No Audits
3a9ac1ba3fb2 Doc: stonith_admin: --delay is an optional option for --fence/--unfence/…
Author
gao-yan
Browse Repository
No Audits
4fc564b44919 Fix: controller: avoid possible use-of-NULL on logging fencing message
Author
gao-yan
Browse Repository
No Audits
f0a4d08c9157 Merge pull request #2047 from ClusterLabs/master
Author
wenningerk
Browse Repository
No Audits

Changes (21)

Path

Size

ChangeLog

daemons/

controld/

controld_fencing.c

doc/

Makefile.am

Pacemaker_Administration/

en-US/

Book_Info.xml

Revision_History.xml

Pacemaker_Development/

en-US/

Book_Info.xml

Pacemaker_Development.ent

Revision_History.xml

Pacemaker_Explained/

en-US/

Book_Info.xml

Pacemaker_Explained.ent

Revision_History.xml

lib/

cib/

cluster/

common/

fencing/

lrmd/

pacemaker/

pengine/

services/

tools/

rP4c968ed7a976

View Options

ChangeLog

View Options

daemons/controld/controld_fencing.c

View Options

doc/Makefile.am

View Options

doc/Pacemaker_Administration/en-US/Book_Info.xml

View Options

doc/Pacemaker_Administration/en-US/Revision_History.xml

View Options

doc/Pacemaker_Development/en-US/Book_Info.xml

View Options

doc/Pacemaker_Development/en-US/Pacemaker_Development.ent

View Options

doc/Pacemaker_Development/en-US/Revision_History.xml

View Options

doc/Pacemaker_Explained/en-US/Book_Info.xml

View Options

doc/Pacemaker_Explained/en-US/Pacemaker_Explained.ent

View Options

doc/Pacemaker_Explained/en-US/Revision_History.xml

View Options

lib/cib/Makefile.am

View Options

lib/cluster/Makefile.am

View Options

lib/common/Makefile.am

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/services/Makefile.am

View Options

tools/stonith_admin.c

View Options

Merge pull request #2053 from wenningerk/2.0-mergeback-master4c968ed7a976Actions

Description

Details

Event Timeline

Merged Changes

Changes (21)

rP4c968ed7a976

ChangeLog

daemons/controld/controld_fencing.c

doc/Makefile.am

doc/Pacemaker_Administration/en-US/Book_Info.xml

doc/Pacemaker_Administration/en-US/Revision_History.xml

doc/Pacemaker_Development/en-US/Book_Info.xml

doc/Pacemaker_Development/en-US/Pacemaker_Development.ent

doc/Pacemaker_Development/en-US/Revision_History.xml

doc/Pacemaker_Explained/en-US/Book_Info.xml

doc/Pacemaker_Explained/en-US/Pacemaker_Explained.ent

doc/Pacemaker_Explained/en-US/Revision_History.xml

lib/cib/Makefile.am

lib/cluster/Makefile.am

lib/common/Makefile.am

lib/fencing/Makefile.am

lib/lrmd/Makefile.am

lib/pacemaker/Makefile.am

lib/pengine/Makefile.am

lib/services/Makefile.am

tools/stonith_admin.c

version.m4

Merge pull request #2053 from wenningerk/2.0-mergeback-master
4c968ed7a976
Actions