changeset 12781:d11f25ce3c54 jdk9-b83

Merge
author lana
date Fri, 18 Sep 2015 14:20:39 -0700
parents 970baebaffd0 (diff) 50292d486635 (current diff)
children 34ed7c05fef7
files src/java.base/share/native/libfdlibm/e_pow.c src/java.base/share/native/libfdlibm/w_pow.c src/java.base/share/native/libjava/Image.c src/java.desktop/share/classes/sun/awt/image/AbstractMultiResolutionImage.java src/java.desktop/share/classes/sun/awt/image/MultiResolutionImage.java src/java.management/share/classes/com/sun/jmx/remote/internal/IIOPHelper.java src/java.management/share/classes/com/sun/jmx/remote/internal/IIOPProxy.java src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/ClientProvider.java src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/ProxyInputStream.java src/java.management/share/classes/com/sun/jmx/remote/protocol/iiop/ServerProvider.java test/javax/management/remote/mandatory/connection/NoIIOP.java test/sun/security/tools/jarsigner/warnings.sh
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Sep 18 11:24:54 2015 -0700
+++ b/.hgtags	Fri Sep 18 14:20:39 2015 -0700
@@ -324,3 +324,4 @@
 d99c2ffdd0f15753e69126583688f2f075a0a5e8 jdk9-b79
 4947810137ae53abba3028cc366af953d90fa81a jdk9-b80
 fdc13a2d32867ca3c57b7fa2620c6b59c83168cb jdk9-b81
+b10b64263b563e21f055c881444f625ec618b826 jdk9-b82