hg: panama/dev: 2 new changesets
vladimir.x.ivanov at oracle.com
vladimir.x.ivanov at oracle.com
Fri Mar 1 01:45:04 UTC 2019
Changeset: 8fceb23343fd
Author: vlivanov
Date: 2019-02-28 16:41 -0800
URL: http://hg.openjdk.java.net/panama/dev/rev/8fceb23343fd
Manual merge with default
! make/autoconf/toolchain.m4
! src/hotspot/cpu/x86/vm_version_x86.hpp
! src/hotspot/cpu/x86/x86_64.ad
- src/hotspot/share/gc/g1/dirtyCardQueue.cpp
- src/hotspot/share/gc/g1/dirtyCardQueue.hpp
- src/hotspot/share/gc/z/zStatTLAB.cpp
- src/hotspot/share/gc/z/zStatTLAB.hpp
- src/hotspot/share/oops/array.inline.hpp
! src/hotspot/share/opto/compile.cpp
! src/hotspot/share/opto/graphKit.cpp
! src/hotspot/share/opto/graphKit.hpp
! src/hotspot/share/opto/memnode.cpp
! src/hotspot/share/runtime/deoptimization.cpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/vmStructs.cpp
! src/hotspot/share/utilities/globalDefinitions.hpp
- src/java.desktop/share/classes/sun/awt/AWTSecurityManager.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_html.properties
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_text.properties
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_unknown.properties
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_xml.properties
Changeset: ec5b4c08ff5a
Author: vlivanov
Date: 2019-02-28 16:44 -0800
URL: http://hg.openjdk.java.net/panama/dev/rev/ec5b4c08ff5a
Manual merge with foreign.
! make/autoconf/toolchain.m4
! src/hotspot/cpu/x86/vm_version_x86.hpp
! src/hotspot/cpu/x86/x86_64.ad
- src/hotspot/share/gc/g1/dirtyCardQueue.cpp
- src/hotspot/share/gc/g1/dirtyCardQueue.hpp
- src/hotspot/share/gc/z/zStatTLAB.cpp
- src/hotspot/share/gc/z/zStatTLAB.hpp
- src/hotspot/share/oops/array.inline.hpp
! src/hotspot/share/opto/compile.cpp
! src/hotspot/share/opto/graphKit.cpp
! src/hotspot/share/opto/graphKit.hpp
! src/hotspot/share/opto/memnode.cpp
! src/hotspot/share/runtime/deoptimization.cpp
! src/hotspot/share/runtime/globals.hpp
! src/hotspot/share/runtime/vmStructs.cpp
! src/hotspot/share/utilities/globalDefinitions.hpp
- src/java.desktop/share/classes/sun/awt/AWTSecurityManager.java
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_html.properties
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_text.properties
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_unknown.properties
- src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/output_xml.properties
More information about the panama-dev
mailing list