Merge branch '1.1' of github.com:ClusterLabs/pacemaker into 1.1
2a1847ec47b8
Actions

Description

Merge branch '1.1' of github.com:ClusterLabs/pacemaker into 1.1

Details

Provenance

Authored on Jun 19 2015, 1:09 AM

Parents

rPa0449d443fa5: Merge pull request #710 from HideoYamauchi/1.1
rP26180cd6ff0e: Merge branch '1.1' of github.com:ClusterLabs/pacemaker into 1.1

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

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
9020865cbdfb Low : fencing : Correction of the log output of the practice node of stonith.
Author
HideoYamauchi
Browse Repository
No Audits

Changes (10)

Path

Size

fencing/

remote.c

lib/

cib/

cib_utils.c

common/

xml.c

pengine/

regression.sh

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

rP2a1847ec47b8

View Options

fencing/remote.c

View Options

lib/cib/cib_utils.c

View Options

lib/common/xml.c

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 branch '1.1' of github.com:ClusterLabs/pacemaker into 1.12a1847ec47b8Actions

Description

Details

Event Timeline

Merged Changes

Changes (10)

rP2a1847ec47b8

fencing/remote.c

lib/cib/cib_utils.c

lib/common/xml.c

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 branch '1.1' of github.com:ClusterLabs/pacemaker into 1.1
2a1847ec47b8
Actions