hg: amber/amber/jdk: manual merge
maurizio.cimadamore at oracle.com
maurizio.cimadamore at oracle.com
Fri Jun 16 09:25:09 UTC 2017
Changeset: 43d83958dcde
Author: mcimadamore
Date: 2017-06-16 10:23 +0100
URL: http://hg.openjdk.java.net/amber/amber/jdk/rev/43d83958dcde
manual merge
! src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
! src/java.base/share/classes/java/lang/invoke/package-info.java
- test/java/nio/file/Files/walkFileTree/PrintFileTree.java
- test/java/nio/file/Files/walkFileTree/find.sh
- test/java/util/Arrays/ParallelPrefix.java
- test/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/MyResourcesProvider.java
- test/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/resources/MyResourcesProvider.java
- test/java/util/ResourceBundle/modules/basic/src/mainbundles/jdk/test/resources/MyResourcesProvider.java
- test/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResourcesProvider.java
- test/java/util/ResourceBundle/modules/visibility/src/exported.named.bundles/jdk/test/resources/exported/classes/MyResourcesProvider.java
- test/java/util/ResourceBundle/modules/visibility/src/named.bundles/jdk/test/resources/classes/MyResourcesProvider.java
- test/java/util/ResourceBundle/modules/visibility/src/named.bundles/jdk/test/resources/props/MyResourcesProvider.java
- test/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResourcesProvider.java
- test/sun/net/InetAddress/nameservice/dns/cname.sh
- test/sun/net/ftp/MarkResetTest.sh
- test/sun/net/www/protocol/file/DirPermissionDenied.sh
- test/sun/net/www/protocol/jrt/other_resources.sh
More information about the amber-dev
mailing list