Merge branch '2.0' of https://github.com/ClusterLabs/pacemaker
Conflicts (resolved by using 2.0 version):
lib/common/xml.c
Description
Description
Details
Details
- Provenance
kgaillot Authored on Apr 30 2018, 7:22 PM - Parents
- rP42dc2bbce5f3: Fix: crm_diff: rhbz#1561617 - Ignore attribute placement when comparing in…
rPc0d7ba798544: Merge pull request #1475 from kgaillot/changes20 - 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.
- bbaaa371c674 Test: cts: update log message patternsAuthor
- 0a3aa07ab196 Log: all: change log file message formatAuthor
- 007dd32a3b57 Test: cts-exec: bump some timeoutsAuthor
- 51adf17bb709 Build: based: rename source filesAuthor
- e681978bd819 Build: fenced: rename source filesAuthor
- 3a9a5c9bb897 Refactor: pacemakerd: remove dead codeAuthor
- 9ecbfea1cb76 Test: rename cts-pengine to cts-schedulerAuthor
- 4599b58788b2 Build: scheduler: rename source filesAuthor
- 299908a9552e Build: controld: rename source code filesAuthor
Very Large Commit
This commit is very large, and affects more than 1000 files. Changes are not shown.