Merge pull request #1281 from kgaillot/fixes
d0f02771a76e
Actions

Description

Merge pull request #1281 from kgaillot/fixes

Pull 1.1.17-rc2 back into master

Details

Provenance

kgaillot	Authored on May 23 2017, 12:18 PM
GitHub <noreply@github.com>	Committed on May 23 2017, 12:18 PM

Parents

rP30a3b9883870: Low: libcrmcommon: bump CRM feature set for versioned operation attributes
rP35eee4ac5dc1: Merge pull request #1277 from HideoYamauchi/add_attribute_alert_pr3

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

30a3b9883870 Low: libcrmcommon: bump CRM feature set for versioned operation attributes
Author
kgaillot
Browse Repository
No Audits
7ac22b338a19 Log: various: fix spelling in messages and comments
Author
kgaillot
Browse Repository
No Audits
3ddebbc68ac6 Low: liblrmd: header guard only useful if you use it
Author
kgaillot
Browse Repository
No Audits
f48d3129e9d1 Log: cib: reword trace message
Author
kgaillot
Browse Repository
No Audits
7cb3f9776811 Merge branch '1.1' of https://github.com/ClusterLabs/pacemaker into fixes
Author
kgaillot
Browse Repository
No Audits
524251cbb686 Doc: update change log for 1.1.17-rc2
Author
kgaillot
Browse Repository
No Audits
8fdb646bd660 Merge pull request #1280 from kgaillot/fixes11
Author
kgaillot
Browse Repository
No Audits
183f33dd031d Doc: Pacemaker Explained: clarify bundle requirements
Author
kgaillot
Browse Repository
No Audits
6f0468b80ac6 Fix: libpe_status: correctly flag remote connection resources
Author
kgaillot
Browse Repository
No Audits
56a7985a768c Low: pengine: improve internal bundle constraints
Author
kgaillot
Browse Repository
No Audits
bd7f2b648415 Log: pengine: re-phrase trace log for internal constraints
Author
kgaillot
Browse Repository
No Audits
32477db962b9 Low: libpe_status: set #kind to "container" for bundle nodes
Author
kgaillot
Browse Repository
No Audits
25d6b6f0112c Low: pengine,libpengine: avoid potential use-of-NULL
Author
kgaillot
Browse Repository
No Audits
ce01a26b7794 Fix: pengine: avoid use-of-NULL in bundle without primitive
Author
kgaillot
Browse Repository
No Audits
048c3e28d2de Low: pengine: avoid double include
Author
kgaillot
Browse Repository
No Audits
74b95e26b815 Test: pengine: update regression tests for score change
Author
kgaillot
Browse Repository
No Audits
c9dcc29b1e9b Low: libpengine: don't double score when adding first allowed node
Author
kgaillot
Browse Repository
No Audits
2d6b90ff01f9 Low: pengine: improve detection of invalid constraints
Author
kgaillot
Browse Repository
No Audits
b08ff7bea963 Fix: PE: Prevent use-of-NULL when expanding containers
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
4d52523d6b10 Test: PE: Ensure remote connections are available before attempting resource…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
7a9d55107fd3 Fix: PE: Partially restore 62ed004 to ensure remote connections are available…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
f8331b45de50 Merge pull request #1279 from wenningerk/improve_stonith
Author
kgaillot
Browse Repository
No Audits
8f3213cfceb5 Fix: stonith-ng: Trigger on constraints added to cib
Author
wenningerk
Browse Repository
No Audits
ce86684f5d06 Merge pull request #1274 from jnpkrn/build-spec
Author
kgaillot
Browse Repository
No Audits
0d2e0d9cd11d Build: spec: fix broken pre-release by tag detection
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits

Changes (28)

Path

Size

cib/

crmd/

cts/

doc/

Pacemaker_Explained/

en-US/

Ch-Advanced-Resources.txt

fencing/

commands.c

main.c

include/

crm/

cluster/

common/

lib/

ais/

cluster/

common/

pengine/

pengine/

test10/

remote-orphaned.scores

whitebox-orphaned.scores

utilization.c

rPd0f02771a76e

View Options

ChangeLog

View Options

cib/callbacks.c

View Options

crmd/control.c

View Options

crmd/fsa_defines.h

View Options

cts/CM_lha.py

View Options

doc/Pacemaker_Explained/en-US/Ch-Advanced-Resources.txt

View Options

fencing/commands.c

View Options

fencing/main.c

View Options

include/crm/cluster/internal.h

View Options

include/crm/common/xml.h

View Options

include/crm/crm.h

View Options

include/crm/lrmd.h

View Options

include/crm/msg_xml.h

View Options

lib/ais/plugin.c

View Options

lib/cluster/heartbeat.c

View Options

lib/common/strings.c

View Options

lib/pengine/complex.c

View Options

lib/pengine/container.c

View Options

lib/pengine/unpack.c

View Options

lib/pengine/utils.c

View Options

pacemaker.spec.in

View Options

pengine/allocate.c

View Options

pengine/container.c

View Options

pengine/graph.c

View Options

pengine/native.c

View Options

pengine/test10/remote-orphaned.scores

View Options

pengine/test10/whitebox-orphaned.scores

View Options

Merge pull request #1281 from kgaillot/fixesd0f02771a76eActions

Description

Details

Event Timeline

Merged Changes

Changes (28)

rPd0f02771a76e

ChangeLog

cib/callbacks.c

crmd/control.c

crmd/fsa_defines.h

cts/CM_lha.py

doc/Pacemaker_Explained/en-US/Ch-Advanced-Resources.txt

fencing/commands.c

fencing/main.c

include/crm/cluster/internal.h

include/crm/common/xml.h

include/crm/crm.h

include/crm/lrmd.h

include/crm/msg_xml.h

lib/ais/plugin.c

lib/cluster/heartbeat.c

lib/common/strings.c

lib/pengine/complex.c

lib/pengine/container.c

lib/pengine/unpack.c

lib/pengine/utils.c

pacemaker.spec.in

pengine/allocate.c

pengine/container.c

pengine/graph.c

pengine/native.c

pengine/test10/remote-orphaned.scores

pengine/test10/whitebox-orphaned.scores

pengine/utilization.c

Merge pull request #1281 from kgaillot/fixes
d0f02771a76e
Actions