Merge branch 'master' of https://github.com/ClusterLabs/pacemaker into 2.0
Conflicts:
lib/Makefile.am
lib/fencing/st_client.c
lib/services/services_linux.c
Merge branch 'master' of https://github.com/ClusterLabs/pacemaker into 2.0
Tags None Referenced Files None Subscribers None
Description Merge branch 'master' of https://github.com/ClusterLabs/pacemaker into 2.0 Conflicts:
Details
Event Timeline
Merged Changes This commit merges a very large number of changes. Only the first 50 are shown.
Changes (641) Very Large CommitThis commit is very large. Load each file individually.
rP9573365ae8a9 |