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

Description

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

Details

Provenance

Authored on May 27 2014, 1:42 AM

Parents

rPee74f3573c18: Merge pull request #521 from gao-yan/unmanaged-block-restart
rP9940df8c2dba: Fix: systemd: Try to handle dbus actions that complete prior to configuring a…

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

ee74f3573c18 Merge pull request #521 from gao-yan/unmanaged-block-restart
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
9ab5db520fd3 Test: pengine: Mark unrunnable stop actions as "blocked" and show the correct…
Author
gao-yan
Browse Repository
No Audits
a72c38ed4474 Fix: pengine: Mark unrunnable stop actions as "blocked" and show the correct…
Author
gao-yan
Browse Repository
No Audits
285f72c3bf16 Test: pengine: Block restart of resources if any dependent resource in a group…
Author
gao-yan
Browse Repository
No Audits
6cc34510db13 Fix: pengine: Block restart of resources if any dependent resource in a group…
Author
gao-yan
Browse Repository
No Audits
78b387c6464b Merge pull request #520 from davidvossel/1.1.12-testing2
Author
Andrew Beekhof <andrew@beekhof.net>
Browse Repository
No Audits
f963b3e8cb4e Fix: mainloop: Canceling in-flight operations should not fail if child process…
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits
2055ab9f0797 Low: cts: more cts changes to allow pacemaker-2.0 schema
Author
David Vossel <dvossel@redhat.com>
Browse Repository
No Audits

Changes (18)

Path

Size

cts/

CIB.py

CTSlab.py

lib/

common/

pengine/

test10/

9-am-then-bm-b-migrating-a-stopping.summary

unmanaged-block-restart.dot

	unmanaged-block-restart.exp
	stopped-monitor-23.exp

unmanaged-block-restart.scores

unmanaged-block-restart.summary

unmanaged-block-restart.xml

rP5f69a1b5ab08

View Options

cts/CIB.py

View Options

cts/CTSlab.py

View Options

lib/common/mainloop.c

View Options

pengine/native.c

View Options

pengine/regression.sh

View Options

pengine/test10/797.summary

View Options

pengine/test10/9-am-then-bm-b-migrating-a-stopping.summary

View Options

pengine/test10/bug-5028.summary

View Options

pengine/test10/bug-cl-5212.summary

View Options

pengine/test10/group14.summary

View Options

pengine/test10/quorum-3.summary

View Options

pengine/test10/rec-node-10.summary

View Options

pengine/test10/rec-node-8.summary

View Options

pengine/test10/unmanaged-block-restart.dot

View Options

pengine/test10/unmanaged-block-restart.exp

View Options

pengine/test10/unmanaged-block-restart.scores

View Options

pengine/test10/unmanaged-block-restart.summary

View Options

pengine/test10/unmanaged-block-restart.xml

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

Description

Details

Event Timeline

Merged Changes

Changes (18)

rP5f69a1b5ab08

cts/CIB.py

cts/CTSlab.py

lib/common/mainloop.c

pengine/native.c

pengine/regression.sh

pengine/test10/797.summary

pengine/test10/9-am-then-bm-b-migrating-a-stopping.summary

pengine/test10/bug-5028.summary

pengine/test10/bug-cl-5212.summary

pengine/test10/group14.summary

pengine/test10/quorum-3.summary

pengine/test10/rec-node-10.summary

pengine/test10/rec-node-8.summary

pengine/test10/unmanaged-block-restart.dot

pengine/test10/unmanaged-block-restart.exp

pengine/test10/unmanaged-block-restart.scores

pengine/test10/unmanaged-block-restart.summary

pengine/test10/unmanaged-block-restart.xml

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