[jdk11u-dev] Integrated: 8300424: [11u] Chunk lost in backport of 8297569
Goetz Lindenmaier
goetz at openjdk.org
Wed Jan 18 11:12:33 UTC 2023
On Wed, 18 Jan 2023 07:29:02 GMT, Goetz Lindenmaier <goetz at openjdk.org> wrote:
> This change belongs to JDK-8297569.
>
> Please compare the push:
> https://github.com/openjdk/jdk11u-dev/commit/71e89e121c318cd2627d2c1b46962b157483ab31
> and what I originally backported:
> https://github.com/openjdk/jdk11u-dev/pull/1651/commits/c7527505a3dd425914c3037f3e4e003654119bc7
>
> 8297569 was a dependent pull request on top of 8294378.
> After pushing 8294378 skara rebased the PR on top and asked me to resolve.
> The resolve dialog in the web interface only found conflicts in URLPermission.java.
> The other two files were resolved automatically. So I missed this difference.
> As the merge change is empty, I did not detect this.
This pull request has now been integrated.
Changeset: c1dfd3ee
Author: Goetz Lindenmaier <goetz at openjdk.org>
URL: https://git.openjdk.org/jdk11u-dev/commit/c1dfd3ee8f7a9b9c24cb5a6b5cf7c3b58ed5db4a
Stats: 3 lines in 1 file changed: 0 ins; 3 del; 0 mod
8300424: [11u] Chunk lost in backport of 8297569
Reviewed-by: sgehwolf
-------------
PR: https://git.openjdk.org/jdk11u-dev/pull/1668
More information about the jdk-updates-dev
mailing list