Merge branch 'master' of https://github.com/ClusterLabs/pacemaker into 2.0
Conflicts (all resolved in favor of master branch code):
daemons/controld/controld_execd.c
lib/common/utils.c
lib/pengine/clone.c
lib/pengine/unpack.c
Description
Description
Details
Details
- Provenance
kgaillot Authored on Dec 11 2018, 2:56 PM - Parents
- rPae891a4eb72d: Merge pull request #1642 from kgaillot/fixes
rP8cf3fe749e5b: Doc: update change log for 2.0.0 release - Branches
- Unknown
- Tags
- Unknown
Event Timeline
Merged Changes
Merged Changes
This commit merges a very large number of changes. Only the first 50 are shown.
- fcafe730e391 Build: remove buildbot helper scriptAuthor
- 608fc44420b6 Doc: Pacemaker Development: update FAQAuthor
- a826682e91d5 Doc: shared: add ClusterLabs link in introAuthor
Very Large Commit
This commit is very large, and affects more than 1000 files. Changes are not shown.