Merge branch 'colocation_changes' of https://github.com/davidvossel/pacemaker
Conflicts:
pengine/native.c
pengine/test10/clone-anon-failcount.scores
Merge branch 'colocation_changes' of https://github.com/davidvossel/pacemaker
Tags None Referenced Files None Subscribers None
Description Merge branch 'colocation_changes' of https://github.com/davidvossel/pacemaker Conflicts:
Details
Event Timeline
Merged Changes |