hg: panama/dev: manual merge

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Thu Sep 20 17:39:59 UTC 2018


Changeset: 748f0ad08c18
Author:    mcimadamore
Date:      2018-09-20 18:39 +0100
URL:       http://hg.openjdk.java.net/panama/dev/rev/748f0ad08c18

manual merge

! make/autoconf/flags.m4
! make/autoconf/spec.gmk.in
- make/jdk/src/classes/build/tools/hasher/Hasher.java
- make/jdk/src/classes/build/tools/jarreorder/JarReorder.java
- make/mapfiles/libjsound/mapfile-vers
- make/mapfiles/libjvm_db/mapfile-vers
- make/mapfiles/libjvm_dtrace/mapfile-vers
! src/java.base/share/classes/java/lang/System.java
! src/java.base/share/classes/jdk/internal/misc/JavaLangAccess.java
- src/java.base/windows/conf/tzmappings
- 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
- test/jdk/java/util/ServiceLoader/basic/basic.sh
- test/jdk/lib/testlibrary/jdk/testlibrary/Utils.java



More information about the panama-dev mailing list