hg: panama/dev: Automatic merge with foreign

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Wed Sep 12 20:08:08 UTC 2018


Changeset: 836a2a98662c
Author:    mcimadamore
Date:      2018-09-12 22:10 +0200
URL:       http://hg.openjdk.java.net/panama/dev/rev/836a2a98662c

Automatic merge with foreign

- make/mapfiles/libjsig/mapfile-vers-solaris
! src/hotspot/cpu/aarch64/aarch64.ad
! src/hotspot/cpu/ppc/ppc.ad
! src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp
! src/hotspot/cpu/x86/macroAssembler_x86.cpp
! src/hotspot/share/opto/graphKit.cpp
! src/hotspot/share/opto/graphKit.hpp
! src/hotspot/share/opto/library_call.cpp
! src/hotspot/share/runtime/globals.hpp
- src/java.desktop/windows/native/common/awt_makecube.cpp
- test/hotspot/jtreg/vmTestbase/nsk/share/test/timeoutwatchdog/TimeoutHandler.java
- test/hotspot/jtreg/vmTestbase/nsk/share/test/timeoutwatchdog/TimeoutWatchdog.java
- test/hotspot/jtreg/vmTestbase/vm/share/gc/TriggerUnloadingByFillingHeap.java
- test/hotspot/jtreg/vmTestbase/vm/share/vmstresser/CompileAndDeoptimize.java
- test/hotspot/jtreg/vmTestbase/vm/share/vmstresser/MetaspaceStresser.java
- test/jdk/com/sun/jdi/Redefine-g.sh
- test/jdk/com/sun/jdi/RedefineAbstractClass.sh
- test/jdk/com/sun/jdi/RedefineAddPrivateMethod.sh
- test/jdk/com/sun/jdi/RedefineAnnotation.sh
- test/jdk/com/sun/jdi/RedefineChangeClassOrder.sh
- test/jdk/com/sun/jdi/RedefineClasses.sh
- test/jdk/com/sun/jdi/RedefineClearBreakpoint.sh
- test/jdk/com/sun/jdi/RedefineImplementor.sh
- test/jdk/java/util/zip/ZipFile/deletetempjar.sh
- test/jdk/javax/naming/module/basic.sh
- test/jdk/lib/testlibrary/jdk/testlibrary/JDKToolFinder.java
- test/jdk/lib/testlibrary/jdk/testlibrary/JDKToolLauncher.java
- test/jdk/lib/testlibrary/jdk/testlibrary/OutputAnalyzer.java
- test/jdk/lib/testlibrary/jdk/testlibrary/OutputBuffer.java
- test/jdk/lib/testlibrary/jdk/testlibrary/ProcessTools.java
- test/jdk/lib/testlibrary/jdk/testlibrary/StreamPumper.java



More information about the panama-dev mailing list