hg: amber/amber: Automatic merge with default

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Thu Apr 4 20:05:21 UTC 2019


Changeset: 4461b14e6543
Author:    mcimadamore
Date:      2019-04-04 22:05 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/4461b14e6543

Automatic merge with default

! make/autoconf/spec.gmk.in
! src/hotspot/share/classfile/classFileParser.cpp
! src/hotspot/share/classfile/systemDictionary.hpp
! src/hotspot/share/classfile/vmSymbols.hpp
! src/hotspot/share/oops/instanceKlass.cpp
! src/hotspot/share/oops/instanceKlass.hpp
! src/hotspot/share/oops/klass.cpp
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesFrameWriter.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FrameOutputWriter.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleFrameWriter.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexFrameWriter.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModulePackageIndexFrameWriter.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageFrameWriter.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageIndexFrameWriter.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
- test/hotspot/jtreg/applications/ctw/modules/jdk_incubator_httpclient.java
- test/hotspot/jtreg/applications/ctw/modules/jdk_packager.java
- test/hotspot/jtreg/applications/ctw/modules/jdk_packager_services.java
- test/jdk/sun/security/ssl/rsa/BrokenRSAPrivateCrtKey.java
- test/langtools/jdk/javadoc/doclet/AccessFrameTitle/AccessFrameTitle.java
- test/langtools/jdk/javadoc/doclet/AccessFrameTitle/p1/C1.java
- test/langtools/jdk/javadoc/doclet/AccessFrameTitle/p2/C2.java
- test/langtools/jdk/javadoc/doclet/PackagesHeader/PackagesHeader.java
- test/langtools/jdk/javadoc/doclet/PackagesHeader/p1/C1.java
- test/langtools/jdk/javadoc/doclet/PackagesHeader/p2/C2.java
- test/langtools/jdk/javadoc/doclet/testClassDocCatalog/TestClassDocCatalog.java
- test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyAnnotation.java
- test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyClass.java
- test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyEnum.java
- test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyError.java
- test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyException.java
- test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg1/EmptyInterface.java
- test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyAnnotation.java
- test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyClass.java
- test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyEnum.java
- test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyError.java
- test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyException.java
- test/langtools/jdk/javadoc/doclet/testClassDocCatalog/pkg2/EmptyInterface.java
- test/langtools/jdk/javadoc/doclet/testFramesNoFrames/TestFramesNoFrames.java
- test/langtools/jdk/javadoc/doclet/testWindowTitle/TestWindowTitle.java
- test/langtools/jdk/javadoc/doclet/testWindowTitle/p1/C1.java
- test/langtools/jdk/javadoc/doclet/testWindowTitle/p2/C2.java



More information about the amber-dev mailing list