hg: amber/amber: Automatic merge with default

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Fri Feb 7 20:40:02 UTC 2020


Changeset: e2b66a04ca50
Author:    mcimadamore
Date:      2020-02-07 20:39 +0000
URL:       https://hg.openjdk.java.net/amber/amber/rev/e2b66a04ca50

Automatic merge with default

! src/hotspot/share/classfile/classFileParser.cpp
! src/hotspot/share/classfile/vmSymbols.hpp
- src/hotspot/share/gc/shared/owstTaskTerminator.cpp
- src/hotspot/share/gc/shared/owstTaskTerminator.hpp
! src/hotspot/share/logging/logTag.hpp
! src/hotspot/share/oops/instanceKlass.cpp
! src/hotspot/share/oops/method.cpp
! src/hotspot/share/oops/method.hpp
! src/hotspot/share/prims/jvm.cpp
- src/hotspot/share/runtime/fieldType.cpp
- src/hotspot/share/runtime/fieldType.hpp
- src/java.base/share/classes/java/lang/reflect/ProxyGenerator_v49.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/LinkInfoImpl.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ClassBuilder.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
- test/hotspot/jtreg/runtime/7162488/Test7162488.sh
- test/hotspot/jtreg/runtime/StackGap/testme.sh
- test/hotspot/jtreg/runtime/StackGuardPages/testme.sh
- test/hotspot/jtreg/runtime/TLS/testtls.sh
- test/hotspot/jtreg/vmTestbase/metaspace/flags/maxMetaspaceSize/TestDescription.java
- test/hotspot/jtreg/vmTestbase/metaspace/flags/maxMetaspaceSize/maxMetaspaceSize.sh



More information about the amber-dev mailing list