hg: amber/amber: Automatic merge with condy
maurizio.cimadamore at oracle.com
maurizio.cimadamore at oracle.com
Fri Jan 12 12:18:53 UTC 2018
Changeset: 27785de496e3
Author: mcimadamore
Date: 2018-01-12 13:16 +0100
URL: http://hg.openjdk.java.net/amber/amber/rev/27785de496e3
Automatic merge with condy
- make/langtools/intellij/runConfigurations/javah.xml
- make/langtools/test/bootstrap/javah.sh
- make/langtools/test/lib/javah.sh
! src/java.base/share/classes/java/lang/invoke/MethodHandle.java
! src/java.base/share/classes/module-info.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.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.compiler/share/classes/com/sun/tools/javac/util/JDK9Wrappers.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CooperativePhaseTest.java
- test/jdk/java/net/httpclient/RequestProcessorExceptions.java
- test/langtools/tools/javac/T6356530/SerializableAbstractClassWithNonAbstractMethodsTest.java
- test/langtools/tools/javac/T6356530/SerializableAbstractClassWithNonAbstractMethodsTest.out
! test/langtools/tools/javac/diags/examples.not-yet.txt
More information about the amber-dev
mailing list