hg: amber/amber: manual merge with default

vicente.romero at oracle.com vicente.romero at oracle.com
Tue Aug 14 15:48:04 UTC 2018


Changeset: e9b9cc6f500e
Author:    vromero
Date:      2018-08-14 08:33 -0700
URL:       http://hg.openjdk.java.net/amber/amber/rev/e9b9cc6f500e

manual merge with default

! src/hotspot/share/classfile/classFileParser.cpp
! src/hotspot/share/classfile/systemDictionary.hpp
! src/hotspot/share/oops/klass.cpp
! src/hotspot/share/oops/klass.hpp
! src/java.base/share/classes/module-info.java
- test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/share/transform/v2/MHSamTF.java



More information about the amber-dev mailing list