HomeClusterLabs Projects

Merge branch 'master' of https://github.com/kgaillot/pacemaker into combine

Description

Merge branch 'master' of https://github.com/kgaillot/pacemaker into combine

Pull master branch fixes into 2.0 branch

Conflicts:
lib/pengine/container.c
tools/crm_resource.c

Details

Provenance
kgaillotAuthored on Feb 13 2018, 10:19 AM
Parents
rP8bbce2383019: Merge pull request #1412 from kgaillot/fixes
rP7acb223795e7: Merge pull request #1418 from kgaillot/changes20
Branches
Loading...
Tags
Loading...

Event Timeline

Merged Changes