hg: amber/amber: Automatic merge with default
maurizio.cimadamore at oracle.com
maurizio.cimadamore at oracle.com
Wed Jan 23 19:49:35 UTC 2019
Changeset: 59d07c8334a5
Author: mcimadamore
Date: 2019-01-23 20:49 +0100
URL: http://hg.openjdk.java.net/amber/amber/rev/59d07c8334a5
Automatic merge with default
- src/hotspot/share/gc/g1/evacuationInfo.hpp
- 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/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
- 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
More information about the amber-dev
mailing list