hg: amber/amber: manual merge with default

vicente.romero at oracle.com vicente.romero at oracle.com
Wed Jan 23 22:36:21 UTC 2019


Changeset: 89e93d9b7045
Author:    vromero
Date:      2019-01-23 17:36 -0500
URL:       http://hg.openjdk.java.net/amber/amber/rev/89e93d9b7045

manual merge with default

! make/hotspot/symbols/symbols-unix
! src/hotspot/share/classfile/classFileParser.cpp
! src/hotspot/share/classfile/classFileParser.hpp
! src/hotspot/share/classfile/vmSymbols.hpp
- src/hotspot/share/gc/g1/evacuationInfo.hpp
! src/hotspot/share/include/jvm.h
! src/hotspot/share/logging/logTag.hpp
! src/hotspot/share/oops/instanceKlass.cpp
! src/hotspot/share/oops/instanceKlass.hpp
! src/hotspot/share/oops/klassVtable.hpp
! src/hotspot/share/oops/method.cpp
! src/hotspot/share/oops/method.hpp
! src/hotspot/share/prims/jvm.cpp
! src/java.base/share/classes/java/lang/Class.java
! src/java.base/share/native/libjava/Class.c
- src/java.base/unix/native/libnio/ch/SocketChannelImpl.c
- src/java.base/unix/native/libnio/ch/SocketDispatcher.c
- src/java.base/windows/native/libnio/ch/SocketChannelImpl.c
- src/java.desktop/share/classes/sun/awt/Graphics2Delegate.java
- src/java.desktop/share/classes/sun/awt/TracedEventQueue.java
- src/java.desktop/share/classes/sun/awt/image/BadDepthException.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
- test/jdk/java/lang/String/AlignIndent.java
- test/jdk/javax/net/ssl/compatibility/Parameter.java
- test/jdk/sun/security/util/Resources/NewNamesFormat.java
- test/jdk/sun/security/util/Resources/NewResourcesNames.java
- test/langtools/jdk/javadoc/doclet/testHtmlLandmarkRegions/TestHtmlLankmarkRegions.java
- test/langtools/tools/javac/RawStringLiteralLang.java
- test/langtools/tools/javac/RawStringLiteralLangAPI.java
- test/langtools/tools/javac/diags/examples/RawStringLiteral.java



More information about the amber-dev mailing list