Merge branch 'master' of github.com:ClusterLabs/pacemaker
02cce44df1a1
Actions

Description

Merge branch 'master' of github.com:ClusterLabs/pacemaker

Details

Provenance

Authored on May 5 2017, 4:23 AM

Parents

rPbd79d1af6f27: Merge pull request #1270 from kgaillot/fixes
rPb71a458dbd2a: Containers: Relax docker/remote colocation constraint when appropriate

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

bd79d1af6f27 Merge pull request #1270 from kgaillot/fixes
Author
kgaillot
Browse Repository
No Audits
455089963083 Test: tools: update regression tests for 2.9 schema
Author
kgaillot
Browse Repository
No Audits
1b344086b341 Low: xml: redo value-source schema change as 2.9 version
Author
kgaillot
Browse Repository
No Audits
5c3c786edb15 Low: libpe_rules: don't include libpe_status header
Author
kgaillot
Browse Repository
No Audits
2bc0c92b4e43 Low: crmd: clean up throttle memory on exit
Author
kgaillot
Browse Repository
No Audits
c561f20a3092 Doc: doxygen: don't publicly document internal API
Author
kgaillot
Browse Repository
No Audits
a2d2e1c3cc2c Doc: Pacemaker Explained: document new value-source option
Author
kgaillot
Browse Repository
No Audits
a1bee3ffdf0f Doc: Pacemaker Explained: clarify networking requirements for bundles
Author
kgaillot
Browse Repository
No Audits
f2948e786548 Low: xml: allow meta-attributes in bundles
Author
kgaillot
Browse Repository
No Audits
5f264b4be1cd Fix: libcib: avoid use-after-free when deleting CIB connection
Author
kgaillot
Browse Repository
No Audits
06e2e269091b Low: systemd unit files: add dependency on resource-agents-deps
Author
kgaillot
Browse Repository
No Audits
7bb912e1c313 Build: rpmlintrc: update rpmlint filters
Author
kgaillot
Browse Repository
No Audits
f05851b2031f Merge pull request #1269 from jnpkrn/xml-bundle
Author
kgaillot
Browse Repository
No Audits
cad6b2007800 Low: xml: relax the strict element order within the bundle body
Author
Jan Pokorný <jpokorny@redhat.com>
Browse Repository
No Audits

Changes (24)

Path

Size

crmd/

control.c

doc/

Pacemaker_Explained/

en-US/

Ch-Advanced-Resources.txt

Ch-Rules.txt

include/

crm/

common/

internal.h

pengine/

rules.h

lib/

cib/

cib_client.c

lrmd/

pacemaker_remote.service.in

mcp/

pacemaker.service.in

rpmlintrc

tools/

crm_mon.service.in

regression.validity.exp

xml/

alerts-2.8.rng

	alerts-2.9.rng
	alerts-2.8.rng

constraints-2.8.rng

	constraints-2.9.rng
	constraints-2.8.rng

constraints-next.rng

nodes-2.8.rng

	nodes-2.9.rng
	nodes-2.8.rng

nvset-2.8.rng

	nvset-2.9.rng
	nvset-2.8.rng

resources-2.8.rng

	resources-2.9.rng
	resources-2.8.rng

rule-2.8.rng

	rule-2.9.rng
	rule-2.8.rng

rP02cce44df1a1

View Options

crmd/control.c

View Options

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

View Options

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

View Options

include/crm/common/internal.h

View Options

include/crm/pengine/rules.h

View Options

lib/cib/cib_client.c

View Options

lrmd/pacemaker_remote.service.in

View Options

mcp/pacemaker.service.in

View Options

rpmlintrc

View Options

tools/crm_mon.service.in

View Options

tools/regression.validity.exp

View Options

xml/alerts-2.8.rng

View Options

xml/alerts-2.9.rng

View Options

xml/constraints-2.8.rng

View Options

xml/constraints-2.9.rng

View Options

xml/constraints-next.rng

View Options

xml/nodes-2.8.rng

View Options

xml/nodes-2.9.rng

View Options

xml/nvset-2.8.rng

View Options

xml/nvset-2.9.rng

View Options

xml/resources-2.8.rng

View Options

xml/resources-2.9.rng

View Options

xml/rule-2.8.rng

View Options

Merge branch 'master' of github.com:ClusterLabs/pacemaker02cce44df1a1Actions

Description

Details

Event Timeline

Merged Changes

Changes (24)

rP02cce44df1a1

crmd/control.c

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

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

include/crm/common/internal.h

include/crm/pengine/rules.h

lib/cib/cib_client.c

lrmd/pacemaker_remote.service.in

mcp/pacemaker.service.in

rpmlintrc

tools/crm_mon.service.in

tools/regression.validity.exp

xml/alerts-2.8.rng

xml/alerts-2.9.rng

xml/constraints-2.8.rng

xml/constraints-2.9.rng

xml/constraints-next.rng

xml/nodes-2.8.rng

xml/nodes-2.9.rng

xml/nvset-2.8.rng

xml/nvset-2.9.rng

xml/resources-2.8.rng

xml/resources-2.9.rng

xml/rule-2.8.rng

xml/rule-2.9.rng

Merge branch 'master' of github.com:ClusterLabs/pacemaker
02cce44df1a1
Actions