hg: panama/dev: manual merge with default

henry.jen at oracle.com henry.jen at oracle.com
Thu Mar 15 18:54:00 UTC 2018


Changeset: f93662e4be1d
Author:    henryjen
Date:      2018-03-15 11:49 -0700
URL:       http://hg.openjdk.java.net/panama/dev/rev/f93662e4be1d

manual merge with default

! src/hotspot/share/ci/ciObject.hpp
! src/hotspot/share/classfile/javaClasses.cpp
- src/hotspot/share/gc/parallel/cardTableExtension.cpp
- src/hotspot/share/gc/parallel/cardTableExtension.hpp
- src/hotspot/share/gc/shared/cardTableModRefBSForCTRS.cpp
! src/hotspot/share/logging/logTag.hpp
- src/hotspot/share/memory/universe_ext.cpp
! src/hotspot/share/opto/graphKit.cpp
! src/hotspot/share/opto/graphKit.hpp
! src/hotspot/share/prims/methodHandles.cpp
! src/hotspot/share/prims/unsafe.cpp
! src/hotspot/share/runtime/vmStructs.cpp
- src/java.base/share/classes/javax/security/auth/Policy.java
- src/java.base/share/classes/sun/security/provider/AuthPolicyFile.java
- test/jdk/sun/java2d/OpenGL/CopyAreaOOB.java
- test/jdk/sun/java2d/OpenGL/CustomCompositeTest.java
- test/jdk/sun/java2d/OpenGL/DrawBufImgOp.java
- test/jdk/sun/java2d/OpenGL/DrawHugeImageTest.java
- test/jdk/sun/java2d/OpenGL/GradientPaints.java
- test/jdk/sun/java2d/OpenGL/bug7181438.java



More information about the panama-dev mailing list