hg: amber/amber: manual merge with default
vicente.romero at oracle.com
vicente.romero at oracle.com
Wed Jan 23 21:43:50 UTC 2019
Changeset: d446deea67ba
Author: vromero
Date: 2019-01-23 16:43 -0500
URL: http://hg.openjdk.java.net/amber/amber/rev/d446deea67ba
manual merge with default
! make/autoconf/spec.gmk.in
! make/hotspot/symbols/symbols-unix
! src/hotspot/share/classfile/classFileParser.cpp
! src/hotspot/share/classfile/classFileParser.hpp
! src/hotspot/share/classfile/systemDictionary.hpp
! src/hotspot/share/classfile/vmSymbols.hpp
- src/hotspot/share/gc/g1/evacuationInfo.hpp
! src/hotspot/share/include/jvm.h
! src/hotspot/share/oops/instanceKlass.cpp
! src/hotspot/share/oops/instanceKlass.hpp
! src/hotspot/share/oops/klass.cpp
! src/hotspot/share/oops/klass.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.compiler/share/classes/javax/lang/model/util/Elements.java
- 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/Check.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/MemberEnter.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.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