Integrated: Merge jdk:master
kcr at openjdk.java.net
Wed Sep 9 19:04:40 UTC 2020
On Wed, 9 Sep 2020 17:21:39 GMT, Kevin Rushforth <kcr at openjdk.org> wrote:
> This is a merge-style PR for the initial changes needed to merge jdk/master into lanai/master so we can change the
> auto-sync to use jdk/master instead of the retired client/master.
> There were several merge conflicts that arose from this due to the fact that the client and jdk git repos had diverged.
> This was caused by a change in the OpenJDK Census data that in turn caused a different git commit hash when converting
> an identical HG commit in the client repo and the jdk repo at two different times. As a result, there are a total of
> 474 commits in the jdk repo that duplicate (but with a different commit hash) commits in the client repo.
This pull request has now been integrated.
Author: Kevin Rushforth <kcr at openjdk.org>
Stats: 11431 lines in 448 files changed: 1524 ins; 8313 del; 1594 mod
More information about the lanai-dev