Diffusion Pacemaker 9fe4f810fb05

Merge ../1.1
9fe4f810fb05
Actions

Description

Merge ../1.1

Conflicts:
include/crm/pengine/status.h

Details

Provenance

Andrew Beekhof <andrew@beekhof.net>

Authored on Jul 1 2015, 6:30 PM

Parents

rP6052cd16c2f4: Build: Update changelog for 1.1.13
rP44eb2ddf8d4f: Fix: PE: Ignore comment blocks when unpacking the cib

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

6052cd16c2f4 Build: Update changelog for 1.1.13
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
a0d51b3ea8ec Build: Update library versions
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
443d9496e960 Fix: Move new struct members to the end for backwards compatibility
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
2a1847ec47b8 Merge branch '1.1' of github.com:ClusterLabs/pacemaker into 1.1
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
a0449d443fa5 Merge pull request #710 from HideoYamauchi/1.1
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
a1d8df17e7ea Merge pull request #716 from gao-yan/cib-update-attributes
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
1370c92e9e84 Merge pull request #717 from gao-yan/utilization-check-allowed-nodes
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
65c4f3aa4dcd Test: pengine: cl#5130 - Only check the capacities of the nodes that are…
Author
gao-yan
Browse Repository
No Audits
9c3b681323c3 Fix: pengine: cl#5130 - Only check the capacities of the nodes that are allowed…
Author
gao-yan
Browse Repository
No Audits
677f53216662 Merge pull request #713 from gao-yan/potential-use-of-null
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
2135206088d8 Merge pull request #715 from gao-yan/patchset-v1-delete-attribute
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
e3d157a9e963 Fix: cib: Correctly add "update-origin", "update-client" and "update-user"…
Author
gao-yan
Browse Repository
No Audits
a2148b95c49e Fix: xml: Correctly create v1 patchsets when deleting attributes
Author
gao-yan
Browse Repository
No Audits
b207154064ca Fix: xml: Prevent potential use-of-NULL
Author
gao-yan
Browse Repository
No Audits
26180cd6ff0e Merge branch '1.1' of github.com:ClusterLabs/pacemaker into 1.1
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
0b79da3e73fe Merge pull request #712 from gao-yan/legacy-mode-digest
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
6176e758c7ce Fix: cib: No need to enforce cib digests for v2 diffs in legacy mode
Author
gao-yan
Browse Repository
No Audits
9020865cbdfb Low : fencing : Correction of the log output of the practice node of stonith.
Author
HideoYamauchi
Browse Repository
No Audits
7ca6cd255670 Merge pull request #709 from gao-yan/cib-legacy-mode
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
8a04347fe76e Fix: cib: Ability to upgrade cib validation schema in legacy mode
Author
gao-yan
Browse Repository
No Audits
caac728b227b Fix: xml: Do not dump deleted attributes
Author
gao-yan
Browse Repository
No Audits
8211f32ca0a5 Fix: cib: Always generate digests for cib diffs in legacy mode
Author
gao-yan
Browse Repository
No Audits
a53678b8e69b Fix: cib: Revert d153b86 to instantly get cib synchronized in legacy mode
Author
gao-yan
Browse Repository
No Audits
42a6d1b76146 Fix: cib: Enable cib legacy mode for plugin-based clusters
Author
gao-yan
Browse Repository
No Audits
be75b5b7a32a Fix: Fencing: Gracefully handle invalid metadata from agents
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits

Changes (21)

Path

Size

cib/

fencing/

include/

crm/

lrmd.h

pengine/

status.h

lib/

cib/

common/

fencing/

lrmd/

pengine/

pengine/

test10/

	utilization-check-allowed-nodes.dot
	bad2.dot

	utilization-check-allowed-nodes.exp
	template-1.exp

	utilization-check-allowed-nodes.scores
	rsc_dep1.scores

	utilization-check-allowed-nodes.summary
	simple12.summary

	utilization-check-allowed-nodes.xml
	colocated-utilization-primitive-1.xml

utilization.c

rP9fe4f810fb05

View Options

ChangeLog

View Options

cib/callbacks.c

View Options

cib/callbacks.h

View Options

cib/messages.c

View Options

fencing/remote.c

View Options

include/crm/lrmd.h

View Options

include/crm/pengine/status.h

View Options

lib/cib/cib_utils.c

View Options

lib/common/Makefile.am

View Options

lib/common/xml.c

View Options

lib/fencing/st_client.c

View Options

lib/lrmd/Makefile.am

View Options

lib/pengine/Makefile.am

View Options

pengine/Makefile.am

View Options

pengine/regression.sh

View Options

pengine/test10/utilization-check-allowed-nodes.dot

View Options

pengine/test10/utilization-check-allowed-nodes.exp

View Options

pengine/test10/utilization-check-allowed-nodes.scores

View Options

pengine/test10/utilization-check-allowed-nodes.summary

View Options

pengine/test10/utilization-check-allowed-nodes.xml

View Options

Merge ../1.19fe4f810fb05Actions

Description

Details

Event Timeline

Merged Changes

Changes (21)

rP9fe4f810fb05

ChangeLog

cib/callbacks.c

cib/callbacks.h

cib/messages.c

fencing/remote.c

include/crm/lrmd.h

include/crm/pengine/status.h

lib/cib/cib_utils.c

lib/common/Makefile.am

lib/common/xml.c

lib/fencing/st_client.c

lib/lrmd/Makefile.am

lib/pengine/Makefile.am

pengine/Makefile.am

pengine/regression.sh

pengine/test10/utilization-check-allowed-nodes.dot

pengine/test10/utilization-check-allowed-nodes.exp

pengine/test10/utilization-check-allowed-nodes.scores

pengine/test10/utilization-check-allowed-nodes.summary

pengine/test10/utilization-check-allowed-nodes.xml

pengine/utilization.c

Merge ../1.1
9fe4f810fb05
Actions