Integrated: Merge jdk:master
Kevin Rushforth
kcr at openjdk.java.net
Fri Sep 11 16:54:35 UTC 2020
Resolve trivial merge conflict in `.jcheck/conf`
-------------
Commit messages:
- Merge jdk:master
- Automatic merge of jdk:master into master
- Automatic merge of jdk:master into master
- Automatic merge of jdk:master into master
- Automatic merge of jdk:master into master
- Automatic merge of jdk:master into master
- Automatic merge of jdk:master into master
- Automatic merge of jdk:master into master
- Automatic merge of jdk:master into master
- Automatic merge of jdk:master into master
- ... and 801 more: https://git.openjdk.java.net/lanai/compare/95251864...1ef52f64
The merge commit only contains trivial merges, so no merge-specific webrevs have been generated.
Changes: https://git.openjdk.java.net/lanai/pull/96/files
Stats: 17728 lines in 92 files changed: 17636 ins; 18 del; 74 mod
Patch: https://git.openjdk.java.net/lanai/pull/96.diff
Fetch: git fetch https://git.openjdk.java.net/lanai pull/96/head:pull/96
PR: https://git.openjdk.java.net/lanai/pull/96
More information about the lanai-dev
mailing list