hg: amber/amber: Automatic merge with default

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Thu Sep 20 20:04:11 UTC 2018


Changeset: de64ad41db08
Author:    mcimadamore
Date:      2018-09-20 22:06 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/de64ad41db08

Automatic merge with default

- src/hotspot/share/classfile/compactHashtable.inline.hpp
- src/java.base/macosx/native/libjli/java_md_macosx.c
- src/java.base/windows/conf/tzmappings
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/NewArrayStub.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/NewInstanceStub.java
! src/jdk.jshell/share/classes/jdk/jshell/CompletenessAnalyzer.java
- test/jdk/java/util/ServiceLoader/basic/basic.sh
- test/jdk/lib/testlibrary/jdk/testlibrary/Utils.java



More information about the amber-dev mailing list