changeset 1237:257be482b6c3

Merge
author asaha
date Thu, 28 Aug 2014 14:39:06 -0700
parents 34147ec06239 e1299cbe39df
children 8c704bcc9733
files .hgtags
diffstat 2 files changed, 48 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Aug 20 12:12:54 2014 -0700
+++ b/.hgtags	Thu Aug 28 14:39:06 2014 -0700
@@ -424,6 +424,9 @@
 55ff6957449cf6c79f5d5bb159df27f51ece1659 jdk7u55-b31
 fba15e177b15873e3c63b0efc7c0f5647a243a79 jdk7u55-b32
 6503115cbedda9216083fc1798e2fa5a2775f68a jdk7u55-b33
+c8614d56bc1c5c60431f938a0c33d8fc42e7aef0 jdk7u55-b34
+be587f9142bcb694b647642fbbb05dbaa7b1b1b3 jdk7u55-b35
+05ea23fd127a217965eb304932e8c0ce5933f04b jdk7u55-b36
 c5b5886004e6446b8b27ccdc1fd073354c1dc614 jdk7u60-b00
 a531112cc6d0b0a1e7d4ffdaa3ba53addcd25cf4 jdk7u60-b01
 d81370c5b863acc19e8fb07315b1ec687ac1136a jdk7u60-b02
@@ -445,6 +448,10 @@
 b96d90694be873372cc417b38b01afed6ac1b239 jdk7u60-b18
 550ae238459e0f59d9a85d183bc2b4520adac05b jdk7u65-b01
 5d1b39fe68944cff6380db56fbe2fbaa28091bf6 jdk7u60-b19
+39734d26e279098fae06cee5a127e126090ddec9 jdk7u60-b30
+8939f268abb8c153de653f2659fff6716e5f83f8 jdk7u60-b31
+9665790000e22370daefddbf56dd81e89e07b7c4 jdk7u60-b32
+437b4b2aed4811af16efcafca7995684493d205b jdk7u60-b33
 6a89d959cbade46fcd281f421ac40a804d098f0b jdk7u65-b02
 afed3d62e8051fe65f431abe87dad50cbeba3800 jdk7u65-b03
 38fabf72970ae509350f57ffad99f6ac8fc6fdad jdk7u65-b04
@@ -465,6 +472,45 @@
 b7f66b9f9e8e099428ed7640a184f6135b77e40d jdk7u65-b18
 50ddba8882e7e95150418a30bfc3ee62e3c28c6c jdk7u65-b19
 dae3f20d2306622e39606d0dc967147de174afce jdk7u65-b32
+ac05dfedf008e83c2044666a70635cf82e932e41 jdk7u65-b20
+244756837ab4b214decd0e6f26b0071a483f143f jdk7u67-b01
+50ddba8882e7e95150418a30bfc3ee62e3c28c6c jdk7u65-b40
+d2f7358b01d3d8b877b2ec2ca2989bd1daf17472 jdk7u65-b31
+2067d7202adcedb80fa676dacb22a0b73d5e8548 jdk7u65-b33
+5b8210c41bc41135687028bcb000ca116e2090f6 jdk7u66-b00
+9f0f0bdd4cfb01a5d64f9528b7ffda3974171120 jdk7u66-b01
+596d979a5d4deb9d10b068479276cd4b2a12432e jdk7u66-b09
+fec514d46b860920690707e9d0538ad76ca3f886 jdk7u66-b10
+09655f16930ece8e7a8342f335726fe9ea327812 jdk7u66-b11
+dca36b02c6e10fa303023a62f51ea4bf0497ae94 jdk7u66-b12
+d0d039a1eca081bc05e833dfc027df1aa1bd018a jdk7u66-b13
+1e46e65dd58db00180f1ccaaae93ae7946b22d29 jdk7u66-b14
+f2c867d52b393e661216057f0b559ef3fd122530 jdk7u66-b15
+3039f266eef2ba54ec2869d87adac6e395c82fe9 jdk7u66-b16
+0b46b93a61966e8d2332f1d3899d7c858a653d91 jdk7u66-b17
+fd1c9030a08d513b5a477f82a46855bb6a9cacac jdk7u71-b00
+50e4090a8583a88875ab7323fc2e5b6ba2f1de7f jdk7u71-b01
+5bd7482913f6a498c2b2b6c80478b2af93dee805 jdk7u71-b02
+557d335eb4a358ffe7a8114685f11831da5d4510 jdk7u71-b03
+ccf59458d69f7fd0d6b119ee1ef16a2b131f84b8 jdk7u71-b04
+92d099fedc269d61dd10bba0f79a224c1bf40c25 jdk7u71-b05
+19de752151f6abfb477c72a92e59993a6c3c3f99 jdk7u71-b06
+36d628e53ebf7f6251395e6eb409239b473a7f16 jdk7u71-b07
+2fdf855f6d9fe27bcf102e64c120375f331ee75d jdk7u71-b08
+1655475001d914bc105959d94c24e0671591e845 jdk7u71-b09
+9508dd229246b82201fb7075ebfe2c913f89a196 jdk7u71-b10
+3e804dc3cea9ff145f375a50a161f3e173e8d3f6 jdk7u71-b11
+287c772d7245396a7a6c7fc409ca8d21ba1ae2c5 jdk7u72-b01
+92552d17915bdf467fe758293eded9e6290f4ce2 jdk7u72-b02
+ae522462810fd74a92b4408b12b036bed5ea3efe jdk7u72-b03
+42a799212f4a287be3d2fd272b9faa3c65326b05 jdk7u72-b04
+a2d4167edbf96cdfda04e829d2baa361ade14bf5 jdk7u72-b05
+01922ce7611b852c7fdc4c0f88c9500c55eccd50 jdk7u72-b06
+b5a2d85c7fce5461d8e1be7e89a891a3ce40f805 jdk7u72-b07
+2b6d8a79df83bc5732ef7c65c51cfe9feac52559 jdk7u72-b08
+c62534f0e97dc7100da18b0b9c034d846f7067dc jdk7u72-b09
+62668c37376f462cfe7bfdfa001f902f52d450ef jdk7u72-b10
+39828d500dfef8045eb5b531182a09ea6ecdfb71 jdk7u72-b11
 1a3aa4637b80fabbd069ae88c241efcb3520fc49 jdk7u80-b00
 df1decc820934ad8bf91c853e81c88d4f7590e25 jdk7u80-b01
 2444fa7df7e3e07f2533f6c875c3a8e408048f6c jdk7u80-b02
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties	Wed Aug 20 12:12:54 2014 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties	Thu Aug 28 14:39:06 2014 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2014, 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
@@ -95,7 +95,7 @@
 bootstrap.exception=\u30D7\u30ED\u30D1\u30C6\u30A3\u3092\u30D5\u30A1\u30A4\u30EB{0}\u306B\u4FDD\u5B58\u4E2D\u306B\u4F8B\u5916\u3092\u6355\u6349\u3057\u307E\u3057\u305F: \u4F8B\u5916{1}
 
 tnameserv.exception=\u30DD\u30FC\u30C8{0}\u3067\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30B5\u30FC\u30D3\u30B9\u3092\u8D77\u52D5\u4E2D\u306B\u4F8B\u5916\u3092\u6355\u6349\u3057\u307E\u3057\u305F
-tnameserv.usage=\u30B3\u30DE\u30F3\u30C9\u30E9\u30A4\u30F3\u5F15\u6570-ORBInitialPort<portno>\u3092\u4F7F\u7528\u3057\u3066\u5225\u306E\u30DD\u30FC\u30C8\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
+tnameserv.usage=\u30B3\u30DE\u30F3\u30C9\u884C\u5F15\u6570-ORBInitialPort<portno>\u3092\u4F7F\u7528\u3057\u3066\u5225\u306E\u30DD\u30FC\u30C8\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
 tnameserv.invalidhostoption=ORBInitialHost\u306FNameService\u306B\u6709\u52B9\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 tnameserv.orbinitialport0=ORBInitialPort 0\u306FNameService\u306B\u6709\u52B9\u306A\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u306F\u3042\u308A\u307E\u305B\u3093
 tnameserv.hs1=\u521D\u671F\u30CD\u30FC\u30DF\u30F3\u30B0\u30FB\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8:\n{0}