hg: amber/amber: manual merge with default

vicente.romero at oracle.com vicente.romero at oracle.com
Fri Apr 13 18:55:28 UTC 2018


Changeset: abdd4c02cf8d
Author:    vromero
Date:      2018-04-13 14:55 -0400
URL:       http://hg.openjdk.java.net/amber/amber/rev/abdd4c02cf8d

manual merge with default

! make/mapfiles/libjsig/mapfile-vers-solaris
- src/java.base/linux/native/libjsig/jsig.c
- src/java.base/macosx/native/libjsig/jsig.c
- src/java.base/share/classes/java/time/format/ZoneName.java
- src/java.base/solaris/native/libjsig/jsig.c
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties



More information about the amber-dev mailing list