Merge branch '2.1' of https://github.com/ClusterLabs/pacemaker
Conflicts:
daemons/pacemakerd/pacemakerd.h
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 This commit merges a very large number of changes. Only the first 50 are shown.
|