Merge branch '2.1' of https://github.com/ClusterLabs/pacemaker
Conflicts:
GNUmakefile
tools/crm_resource.c
Merge branch '2.1' of https://github.com/ClusterLabs/pacemaker
Tags None Referenced Files None Subscribers None
Description Merge branch '2.1' of https://github.com/ClusterLabs/pacemaker Conflicts:
Details
Event Timeline
Merged Changes
|