HomeClusterLabs Projects

Merge branch 'master' of https://github.com/ClusterLabs/pacemaker into 2.0

Description

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

Event Timeline

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.