Merge
authorduke
Wed, 05 Jul 2017 18:17:29 +0200
changeset 13271 75e1bb73df23
parent 13270 521a481677ff (diff)
parent 13269 b3258b6c8d5a (current diff)
child 13276 d4d35b631fa3
Merge
jdk/src/share/classes/sun/security/krb5/ServiceName.java
jdk/test/sun/security/krb5/ServiceNameClone.java
jdk/test/sun/security/mscapi/ShortRSAKey512.sh
jdk/test/sun/security/mscapi/ShortRSAKey768.sh
--- a/jaxws/.hgtags	Wed Jul 05 18:17:25 2017 +0200
+++ b/jaxws/.hgtags	Wed Jul 05 18:17:29 2017 +0200
@@ -169,3 +169,4 @@
 e80ac58b5ba904f24e125c742c30d0d740f05f86 jdk8-b45
 ae368a83c2404b65c9e38c65e2aa081f2201ca74 jdk8-b46
 fe6a060afc404dcf0921708a740de770666b781f jdk8-b47
+efb564de8a8ee397a65fab77d45cb20200f6ddd8 jdk8-b48