Merge pull request #1291 from kgaillot/fixes
27c7f414865b
Actions

Description

Merge pull request #1291 from kgaillot/fixes

Pull 1.1.17-rc4 back into master

Details

Provenance

kgaillot	Authored on Jun 20 2017, 11:52 PM
GitHub <noreply@github.com>	Committed on Jun 20 2017, 11:52 PM

Parents

rP4a13214d8c43: Merge branch '1.1' of https://github.com/ClusterLabs/pacemaker into fixes
rP28cbf387cb63: Merge pull request #1275 from jnpkrn/xml-xslt

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

4a13214d8c43 Merge branch '1.1' of https://github.com/ClusterLabs/pacemaker into fixes
Author
kgaillot
Browse Repository
No Audits
6552a87ce77c Doc: update change log for 1.1.17-rc4
Author
kgaillot
Browse Repository
No Audits
cdba34812591 Merge pull request #1290 from kgaillot/fixes11
Author
kgaillot
Browse Repository
No Audits
15b39e19f294 Fix: libcib: get remoteness correctly from node status
Author
kgaillot
Browse Repository
No Audits
ac906cbf1b46 Fix: libpe_status: avoid memory leaks when creating bundle remote resource
Author
kgaillot
Browse Repository
No Audits
07fc025fb099 Fix: libpe_status: disallow resources on bundle nodes
Author
kgaillot
Browse Repository
No Audits
5b1028c4515f Doc: Pacemaker Explained: update bundle limitations for recent changes
Author
kgaillot
Browse Repository
No Audits
dcc3745b5f7b Merge pull request #1289 from kgaillot/fixes11
Author
kgaillot
Browse Repository
No Audits
f822f38b15e9 Low: pengine: make checks a little safer
Author
kgaillot
Browse Repository
No Audits
44f2c05dcdcf Fix: PE: Clones within bundles may also have notifications enabled
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
61c6a8acd9c0 Fix: PE: Correctly implement pe_order_implies_first_printed
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
499d2d4d300b Fix: PE: Do not re-add a node's default score for each location constraint
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
77a80de9cda4 Fix: PE: Bundle location constraints should only apply to the IP and docker…
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
2cc26c662dbb Refactor: PE: Simplify the bundle and clone colocation_lh functions
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
12abb14f516c PE: Bundles: Allow clones to be colocated with bundles
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
f9ad81dfee97 PE: Bundles: Implement colocation of primitives and groups with bundles
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
d2dd831a2590 Merge pull request #1288 from kgaillot/fixes11
Author
kgaillot
Browse Repository
No Audits
bc6d723a9422 Refactor: libcrmcommon: avoid redundant constant definitions
Author
kgaillot
Browse Repository
No Audits
3f855794adbe Doc: Pacemaker Explained: document cluster-ipc-limit
Author
kgaillot
Browse Repository
No Audits
3e5cdd9b329b Feature: cib,libcib: support option for IPC eviction threshold
Author
kgaillot
Browse Repository
No Audits
b986acbe1312 Low: libcib: correctly search for v2 patchset changes
Author
kgaillot
Browse Repository
No Audits
324e241d9d96 Low: libcib: always use current values when unpacking config
Author
kgaillot
Browse Repository
No Audits
19497fa9785c Low: libcrmcommon: support setting max queue length per IPC client
Author
kgaillot
Browse Repository
No Audits
f93ce6bdd6be Low: libcrmcommon: add function for testing daemon name
Author
kgaillot
Browse Repository
No Audits
ae780515cd4d Refactor: libcrmcommon: remember when IPC client is root or cluster user
Author
kgaillot
Browse Repository
No Audits
0abcd469f5ee Refactor: libcrmcommon: rename queue backlog structure member
Author
kgaillot
Browse Repository
No Audits
769c210a4e94 Refactor: libcrmcommon,cib,lrmd: functionize allocating IPC client object
Author
kgaillot
Browse Repository
No Audits
d3c67afdb612 Low: libpe_status: get rid of redundant test
Author
kgaillot
Browse Repository
No Audits
38a42d8e20cb Doc: Pacemaker Explained: correct batch-limit default
Author
kgaillot
Browse Repository
No Audits
f19804190c92 Log: libcrmcluster: fix spelling error in error message
Author
kgaillot
Browse Repository
No Audits
2af655f20dc2 Low: crmd: DC should update stonith fail count before aborting transition
Author
kgaillot
Browse Repository
No Audits
a2431bd6ef3f Merge pull request #1286 from gao-yan/cib-broadcast-pass-acl
Author
kgaillot
Browse Repository
No Audits
643c352f8235 Fix: cib: Broadcasts of cib changes should always pass ACLs check
Author
gao-yan
Browse Repository
No Audits

Changes (24)

Path

Size

cib/

crmd/

doc/

Pacemaker_Explained/

en-US/

Ch-Advanced-Resources.txt

Ch-Options.txt

include/

crm/

cluster/

internal.h

common/

ipcs.h

util.h

lib/

cib/

common/

pengine/

lrmd/

pengine/

test10/

rP27c7f414865b

View Options

ChangeLog

View Options

cib/callbacks.c

View Options

cib/callbacks.h

View Options

cib/remote.c

View Options

crmd/te_callbacks.c

View Options

crmd/te_utils.c

View Options

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

View Options

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

View Options

include/crm/cluster/internal.h

View Options

include/crm/common/ipcs.h

View Options

include/crm/common/util.h

View Options

lib/cib/cib_attrs.c

View Options

lib/cib/cib_utils.c

View Options

lib/common/ipc.c

View Options

lib/common/utils.c

View Options

lib/pengine/container.c

View Options

lib/pengine/utils.c

View Options

lrmd/tls_backend.c

View Options

pengine/clone.c

View Options

pengine/container.c

View Options

pengine/graph.c

View Options

pengine/test10/base-score.scores

View Options

pengine/utils.c

View Options

Merge pull request #1291 from kgaillot/fixes27c7f414865bActions

Description

Details

Event Timeline

Merged Changes

Changes (24)

rP27c7f414865b

ChangeLog

cib/callbacks.c

cib/callbacks.h

cib/remote.c

crmd/te_callbacks.c

crmd/te_utils.c

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

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

include/crm/cluster/internal.h

include/crm/common/ipcs.h

include/crm/common/util.h

lib/cib/cib_attrs.c

lib/cib/cib_utils.c

lib/common/ipc.c

lib/common/utils.c

lib/pengine/container.c

lib/pengine/utils.c

lrmd/tls_backend.c

pengine/clone.c

pengine/container.c

pengine/graph.c

pengine/test10/base-score.scores

pengine/utils.c

pengine/utils.h

Merge pull request #1291 from kgaillot/fixes
27c7f414865b
Actions