Integrated: JDK-8255032: Conflict between recent pushes breaks the build

Mon Oct 19 22:09:09 UTC 2020

On Mon, 19 Oct 2020 21:42:51 GMT, Jonathan Gibbons <jjg at openjdk.org> wrote:

> The patch resolves a bad merge between two recent changes.
> 
> The `DocletEnvironment docEnv` parameter no longer needs to be passed around.

This pull request has now been integrated.

Changeset: 0f4fb367
Author:    Jonathan Gibbons <jjg at openjdk.org>
URL:       https://git.openjdk.java.net/jdk/commit/0f4fb367
Stats:     2 lines in 1 file changed: 0 ins; 0 del; 2 mod

8255032: Conflict between recent pushes breaks the build

Reviewed-by: redestad, vromero

-------------

PR: https://git.openjdk.java.net/jdk/pull/752