Merge branch 'master' of github.com:ClusterLabs/pacemaker
Conflicts:
pengine/native.c
Description
Description
Details
Details
- Provenance
Andrew Beekhof <andrew@beekhof.net> Authored on Feb 28 2016, 10:00 PM - Parents
- rPfcc8e767378f: Merge pull request #936 from wferi/export
rPba15849215e6: Fix: cpg: Ensure group name is never unset - Branches
- Unknown
- Tags
- Unknown
Event Timeline
Merged Changes
Merged Changes
- fcc8e767378f Merge pull request #936 from wferi/exportAuthor
- 4e31243442f9 Merge pull request #927 from kgaillot/docAuthor