HomeClusterLabs Projects

Merge branch '2.1' of https://github.com/ClusterLabs/pacemaker into fixes

Description

Merge branch '2.1' of https://github.com/ClusterLabs/pacemaker into fixes

Resolved conflicts:

  • daemons/fenced/fenced_commands.c
  • lib/fencing/st_client.c
  • po/zh_CN.po