Merge
authorlana
Thu, 12 May 2016 18:47:08 +0000
changeset 37900 8e5fcef42caa
parent 37873 a5cc1341cf7f (diff)
parent 37899 1b8ec90a1e15 (current diff)
child 37901 e74625573c82
Merge
jdk/make/non-build-utils/src/build/tools/makeclasslist/makeClasslist.js
jdk/make/src/classes/build/tools/addjsum/AddJsum.java
jdk/src/java.base/share/classes/java/util/regex/UnicodeProp.java
jdk/src/java.httpclient/share/classes/java/net/http/CharsetToolkit.java
jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/CGIHandler.java
jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpAwareServerSocket.java
jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpInputStream.java
jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpOutputStream.java
jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpReceiveSocket.java
jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpSendInputStream.java
jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpSendOutputStream.java
jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/HttpSendSocket.java
jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/RMIDirectSocketFactory.java
jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/RMIHttpToCGISocketFactory.java
jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/RMIHttpToPortSocketFactory.java
jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java
jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/RMISocketInfo.java
jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/WrappedSocket.java
jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SortResourcesPlugin.java
jdk/test/java/rmi/transport/httpSocket/HttpSocketTest.java
jdk/test/java/rmi/transport/httpSocket/HttpSocketTest_Stub.java
jdk/test/java/rmi/transport/httpSocket/security.policy
jdk/test/java/util/jar/JarFile/MultiReleaseJarAPI.java
jdk/test/java/util/jar/JarFile/MultiReleaseJarHttpProperties.java
jdk/test/java/util/jar/JarFile/MultiReleaseJarIterators.java
jdk/test/java/util/jar/JarFile/MultiReleaseJarProperties.java
jdk/test/java/util/jar/JarFile/MultiReleaseJarSecurity.java
jdk/test/sun/rmi/transport/proxy/DisableHttpDefaultValue.java
jdk/test/sun/rmi/transport/proxy/EagerHttpFallback.java
jdk/test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java
jdk/test/sun/rmi/transport/tcp/blockAccept/TestIface.java
jdk/test/sun/rmi/transport/tcp/blockAccept/TestImpl.java
jdk/test/sun/rmi/transport/tcp/blockAccept/TestImpl_Stub.java
jdk/test/sun/rmi/transport/tcp/blockAccept/security.policy
jdk/test/tools/jlink/plugins/SorterPluginTest.java
--- a/jdk/.hgtags	Thu May 12 11:16:56 2016 -0700
+++ b/jdk/.hgtags	Thu May 12 18:47:08 2016 +0000
@@ -360,3 +360,4 @@
 35225b837d66582037eeadeb471c13235dfd793d jdk-9+115
 baeb5edb38939cdb78ae0ac6f4fd368465cbf188 jdk-9+116
 4da0f73ce03aaf245b92cc040cc0ab0e3fa54dc2 jdk-9+117
+e1eba5cfa5cc8c66d524396a05323dc93568730a jdk-9+118