hg: amber/amber: Automatic merge with default
maurizio.cimadamore at oracle.com
maurizio.cimadamore at oracle.com
Thu Feb 21 21:09:05 UTC 2019
Changeset: 2c2b1787218f
Author: mcimadamore
Date: 2019-02-21 22:08 +0100
URL: http://hg.openjdk.java.net/amber/amber/rev/2c2b1787218f
Automatic merge with default
! .hgtags
! make/autoconf/flags-cflags.m4
! make/conf/jib-profiles.js
! src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
! src/hotspot/os/linux/os_linux.cpp
! src/hotspot/os/windows/os_windows.hpp
! src/hotspot/share/gc/g1/g1Allocator.hpp
! src/hotspot/share/gc/g1/g1CollectedHeap.hpp
! src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
! src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
- src/hotspot/share/gc/z/zStatTLAB.cpp
- src/hotspot/share/gc/z/zStatTLAB.hpp
! src/hotspot/share/logging/logFileOutput.hpp
! src/hotspot/share/memory/allocation.hpp
- src/hotspot/share/oops/array.inline.hpp
! src/hotspot/share/oops/instanceKlass.cpp
! src/hotspot/share/prims/jvm.cpp
! src/hotspot/share/runtime/arguments.cpp
! src/hotspot/share/utilities/exceptions.hpp
! src/hotspot/share/utilities/globalDefinitions.hpp
- src/java.desktop/share/classes/sun/awt/AWTSecurityManager.java
! src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DocFilesHandlerImpl.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java
! test/hotspot/jtreg/ProblemList.txt
! test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValue/getvalue003.java
! test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues001.java
! test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues002.java
! test/hotspot/jtreg/vmTestbase/nsk/jdi/ObjectReference/getValues/getvalues003.java
! test/jdk/ProblemList.txt
More information about the amber-dev
mailing list