Merge pull request #2246 from clumens/2.0-mergeback-master
dc64a43f950a
Actions

Description

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

Merge 2.0 back into master

Details

Provenance

kgaillot	Authored on Dec 3 2020, 11:35 AM
GitHub <noreply@github.com>	Committed on Dec 3 2020, 11:35 AM

Parents

rPf6097b4e1a30: Merge branch '2.0' into master.
rP1a461e0fe9c5: Merge pull request #2235 from clumens/fo-consistency

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

f6097b4e1a30 Merge branch '2.0' into master.
Author
clumens
Browse Repository
No Audits
ba59be71228f Doc: ChangeLog: update for 2.0.5 release
Author
clumens
Browse Repository
No Audits
dae6f615b1a8 Merge pull request #2244 from clumens/docs
Author
kgaillot
Browse Repository
No Audits
3d4d12b7e6ef Doc: Pacemaker Explained: Fix the node attributes expression table.
Author
clumens
Browse Repository
No Audits
df6430c3d285 Merge pull request #2243 from nrwahl2/nrwahl2-fix_alert_schemav2
Author
kgaillot
Browse Repository
No Audits
16da68b79b1c Merge pull request #2242 from kgaillot/fixes-2.0
Author
kgaillot
Browse Repository
No Audits
dc8951fff6d4 High: xml: Revert to correct schema for alerts-3.5
Author
nrwahl2
Browse Repository
No Audits
75cba939b3f6 Low: tools: match calloc() with free() in crm_resource
Author
kgaillot
Browse Repository
No Audits
2a6ce03c2ff4 Merge pull request #2239 from kgaillot/fixes-2.0
Author
kgaillot
Browse Repository
No Audits
3b13acad52c5 Test: travis: use Ubuntu-friendly configure options
Author
kgaillot
Browse Repository
No Audits
03f106a23c7a Build: configure: query fence-agents for default executable fence agent location
Author
kgaillot
Browse Repository
No Audits
7b20013830b6 Build: configure: move pkg-config requirement up
Author
kgaillot
Browse Repository
No Audits
9b0ab52ae3fb Build: libstonithd: add configure option for fence executable directory
Author
kgaillot
Browse Repository
No Audits
0f190b52d2cd Refactor: fencing: nest C preprocessor conditionals correctly
Author
kgaillot
Browse Repository
No Audits
cbe96bc0a6c9 Merge pull request #2236 from HideoYamauchi/2.0-trac4675
Author
kgaillot
Browse Repository
No Audits
3dd78b7484c2 Test: tools: "Connectivity is lost" may not be displayed even if the ping…
Author
HideoYamauchi
Browse Repository
No Audits
8044bb7cf32f High: tools: "Connectivity is lost" may not be displayed even if the ping…
Author
HideoYamauchi
Browse Repository
No Audits

Changes (12)

Path

Size

.travis.yml

ChangeLog

configure.ac

cts/

cli/

regression.crm_mon.exp

cts-support.in

doc/

Pacemaker_Explained/

en-US/

Ch-Rules.txt

include/

crm/

stonith-ng.h

lib/

fencing/

tools/

xml/

	alerts-3.5.rng
	alerts-2.10.rng

rPdc64a43f950a

View Options

.travis.yml

View Options

ChangeLog

View Options

configure.ac

View Options

cts/cli/regression.crm_mon.exp

View Options

cts/cts-support.in

View Options

doc/Pacemaker_Explained/en-US/Ch-Rules.txt

View Options

include/crm/stonith-ng.h

View Options

lib/fencing/st_client.c

View Options

lib/fencing/st_rhcs.c

View Options

tools/crm_mon_print.c

View Options

tools/crm_resource.c

View Options

Merge pull request #2246 from clumens/2.0-mergeback-masterdc64a43f950aActions

Description

Details

Event Timeline

Merged Changes

Changes (12)

rPdc64a43f950a

.travis.yml

ChangeLog

configure.ac

cts/cli/regression.crm_mon.exp

cts/cts-support.in

doc/Pacemaker_Explained/en-US/Ch-Rules.txt

include/crm/stonith-ng.h

lib/fencing/st_client.c

lib/fencing/st_rhcs.c

tools/crm_mon_print.c

tools/crm_resource.c

xml/alerts-3.5.rng

Merge pull request #2246 from clumens/2.0-mergeback-master
dc64a43f950a
Actions