hg: amber/amber/jdk: manual merge

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Fri Aug 11 10:53:03 UTC 2017


Changeset: ab382fd050b1
Author:    mcimadamore
Date:      2017-08-11 11:50 +0100
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/ab382fd050b1

manual merge

! src/java.base/share/classes/java/lang/invoke/MethodHandle.java
! src/java.base/share/classes/java/lang/invoke/MethodHandles.java
! src/java.base/share/classes/java/lang/invoke/package-info.java
- src/java.base/share/classes/jdk/internal/module/SystemModuleFinder.java
- src/java.base/share/classes/sun/net/www/protocol/https/DefaultHostnameVerifier.java
- src/java.base/share/classes/sun/util/locale/LocaleEquivalentMaps.java
- test/java/lang/ClassLoader/deadlock/Alice.java
- test/java/lang/ClassLoader/deadlock/Bob.java
- test/java/lang/ClassLoader/deadlock/Starter.java
- test/java/lang/ClassLoader/deadlock/SupAlice.java
- test/java/lang/ClassLoader/deadlock/SupBob.java
- test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh
- test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh
- test/java/lang/ClassLoader/getResource/GetResource.sh
- test/java/util/Locale/tools/EquivMapsGenerator.java
- test/java/util/Locale/tools/language-subtag-registry.txt
- test/tools/launcher/modules/patch/systemmodules/src1/java.base/jdk/internal/modules/SystemModules.java



More information about the amber-dev mailing list