hg: amber/amber: Automatic merge with default

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Thu Jan 30 22:07:08 UTC 2020


Changeset: fd17c226ee06
Author:    mcimadamore
Date:      2020-01-30 22:06 +0000
URL:       https://hg.openjdk.java.net/amber/amber/rev/fd17c226ee06

Automatic merge with default

! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/external/jquery/jquery.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOption.java
- test/hotspot/jtreg/vmTestbase/jit/escape/LockCoarsening/LockCoarsening001/TestDescription.java
- test/hotspot/jtreg/vmTestbase/jit/escape/LockCoarsening/LockCoarsening002/TestDescription.java
- test/hotspot/jtreg/vmTestbase/jit/escape/LockCoarsening/run.sh
- test/hotspot/jtreg/vmTestbase/jit/tiered/TestDescription.java
- test/hotspot/jtreg/vmTestbase/jit/tiered/tieredTest.sh
- test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfo/TestDescription.java
- test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfo/run.sh
- test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfoOnCompilation/TestDescription.java
- test/hotspot/jtreg/vmTestbase/vm/compiler/CodeCacheInfoOnCompilation/run.sh
- test/jdk/jdk/jfr/event/io/EvilInstrument.java
- test/jdk/jdk/jfr/event/sampling/libTestNative.c
- test/langtools/jdk/javadoc/doclet/testOptions/help.html
! test/langtools/tools/javac/lambda/LambdaParserTest.java



More information about the amber-dev mailing list