changeset 1361:c8dc52fa0537

Merge
author asaha
date Wed, 15 Jun 2016 13:46:58 -0700
parents bd20023c7d12 fc50e5f1bf46
children d123c31c3bc2
files .hgtags
diffstat 2 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon May 16 14:24:24 2016 -0700
+++ b/.hgtags	Wed Jun 15 13:46:58 2016 -0700
@@ -575,6 +575,7 @@
 cd7cec8fd295c0462a813b5f54dc5457c2bade2d jdk8u91-b00
 4ea02753e66e348ee4639e157061bcbdef1d7ff3 jdk8u91-b13
 f8d0cfaa9900ebda679fa9df8319fb753858f283 jdk8u91-b14
+9f89788050d38ba4e19e24894eb8b3dd24c1a9d0 jdk8u91-b15
 7b719c1dec62535c34030cf3457abe6f478f13a0 jdk8u77-b00
 cafc1648f432eff2c392040af2db4505c3d290b6 jdk8u77-b01
 0f0077ee5e53365562ff77a01aa97d0c7374f447 jdk8u77-b02
@@ -639,6 +640,10 @@
 37bd092c2a7a9e71c027a33757429e02e00050de jdk8u101-b06
 df3cd274d224e22e156556bc0d7b8927b72a7608 jdk8u101-b07
 b8914ce62047d20076a64fd43a6ca8f5bb470047 jdk8u101-b08
+317ccda98b74d445f6d3b241783a22cc167cedbf jdk8u101-b09
+7c90acc432738bdc1506d510daeadf9376279dfa jdk8u101-b10
+4942432b3da1afbc2c2c87bdf896b112800e537c jdk8u101-b11
+f8511bfb19c35d8d396dc53245c06cc3710657b1 jdk8u101-b12
 223d0e48a55b92255f5a613743a99e7deacaf455 jdk8u102-b00
 223d0e48a55b92255f5a613743a99e7deacaf455 jdk8u82-b00
 9d09a2f1395561fe71b1a83f53907ddc52e699d6 jdk8u102-b01
@@ -649,4 +654,8 @@
 2a265ab91dd234348630dab92f622a616ab76a0e jdk8u102-b06
 8d44271dd11dd4bdc88ef647fd144e544791ecc4 jdk8u102-b07
 329501e6cc220884f005afc7cd330e227931fb21 jdk8u102-b08
+e108e30edcca932832e4e5edf1a15349d3be2fed jdk8u102-b09
+e0d70741f35cd16289de3fd6049834879725dae5 jdk8u102-b10
+360a2772486dd1aa818132222ea0b7fcfa5707ef jdk8u102-b11
+57546b5b575dec9ecfbb1e9a77d87c391a44ab96 jdk8u102-b12
 52cca1ce8b473ecd751da2350d4b3ef111b5676e jdk8u111-b00
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties	Mon May 16 14:24:24 2016 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties	Wed Jun 15 13:46:58 2016 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -103,5 +103,5 @@
 tnameserv.hs3=\u5C31\u7DD2\u3002
 
 orbd.commfailure=\n\u56E0\u70BA ORBinitialPort \u5728\u4F7F\u7528\u4E2D\uFF0C\u6240\u4EE5\u7121\u6CD5\u555F\u52D5 ORBD\u3002
-orbd.internalexception=\n\u56E0\u70BA\u5167\u90E8\u767C\u751F\u7570\u5E38\uFF0C\u6240\u4EE5\u7121\u6CD5\u555F\u52D5 ORBD\u3002 \n\u53EF\u80FD\u7684\u539F\u56E0: \n1. \u6307\u5B9A\u7684 ORBInitialPort \u6216 ORBActivationPort \u5728\u4F7F\u7528\u4E2D\u3002 \n2. \u6C92\u6709\u5BEB\u5165 orb.db \u7684\u6B0A\u9650\u3002 
+orbd.internalexception=\n\u56E0\u70BA\u5167\u90E8\u767C\u751F\u7570\u5E38\uFF0C\u6240\u4EE5\u7121\u6CD5\u555F\u52D5 ORBD\u3002\n\u53EF\u80FD\u7684\u539F\u56E0: \n1. \u6307\u5B9A\u7684 ORBInitialPort \u6216 ORBActivationPort \u5728\u4F7F\u7528\u4E2D\u3002\n2. \u6C92\u6709\u5BEB\u5165 orb.db \u7684\u6B0A\u9650\u3002