Merge

Wed, 20 Jul 2016 12:52:51 -0700

author
asaha
date
Wed, 20 Jul 2016 12:52:51 -0700
changeset 1380
b2852fb42628
parent 1356
1d0047d03f04
parent 1379
d5dabec41733
child 1381
ad1a8186a5a8

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Tue Jul 19 15:39:17 2016 -0700
     1.2 +++ b/.hgtags	Wed Jul 20 12:52:51 2016 -0700
     1.3 @@ -597,6 +597,9 @@
     1.4  8f0466c0dce60b1df3bc01785b01a7f09fa7b564 jdk8u92-b13
     1.5  5617f9bec354fb2c60bbb816d175f4cee7d2c56e jdk8u92-b14
     1.6  fe88377e18b0c5f3da8e6741e0d5b9bfd45d2648 jdk8u92-b31
     1.7 +11e4e7e901bc86d14163afbc5d28345e36737344 jdk8u92-b32
     1.8 +9ed665d319590e0b9997b3703314c6b0341d4362 jdk8u92-b33
     1.9 +5b5f76caf6e4ffa51f25e64d0d79a3f0913c633e jdk8u92-b34
    1.10  073b951904b3ee7c54fb79a169478fa66d925320 jdk8u75-b00
    1.11  5b48f7defe40eab668fe554df0afd87d84d60722 jdk8u75-b01
    1.12  0015f4a7f0d02a9bb79b7a0c737590f01feaabd4 jdk8u75-b02
    1.13 @@ -661,6 +664,13 @@
    1.14  57546b5b575dec9ecfbb1e9a77d87c391a44ab96 jdk8u102-b12
    1.15  a7c292080d5ed76ea5e3b123c0dee4c340aa174f jdk8u102-b13
    1.16  56b133772ec1aa4f44f2eee2c4103c645f764935 jdk8u102-b14
    1.17 +8ba5a41487af9fe72aeb92e790327d12dce0de8c jdk8u102-b31
    1.18 +52cca1ce8b473ecd751da2350d4b3ef111b5676e jdk8u111-b00
    1.19 +d123c31c3bc21ccf02ac7368f5476dd9975e15e3 jdk8u111-b01
    1.20 +981c4d9dab16b3fa7333e5baa5497c299acd5172 jdk8u111-b02
    1.21 +893adc105044c14abfb54de32a79f2f21981cafa jdk8u111-b03
    1.22 +ec7b9aafd7e1e9763925e8b794834612bbe0e19b jdk8u111-b04
    1.23 +3a25f8a752524bad7e78800158c485b890be3982 jdk8u111-b05
    1.24  b87d82f5c33dfb55bfc81254044f28eea5d7424a jdk8u112-b00
    1.25  1f2394102288d9073652064784e31a3f52fc5d4b jdk8u112-b01
    1.26  40c934289deefd68915f6519d71a4e315c69117a jdk8u112-b02
     2.1 --- a/src/share/classes/javax/rmi/CORBA/Util.java	Tue Jul 19 15:39:17 2016 -0700
     2.2 +++ b/src/share/classes/javax/rmi/CORBA/Util.java	Wed Jul 20 12:52:51 2016 -0700
     2.3 @@ -414,7 +414,7 @@
     2.4                  // set to allow the loading of the Util delegate
     2.5                  // which provides access to custom ValueHandler
     2.6                  sm.checkPermission(new SerializablePermission(
     2.7 -                        "enableCustomValueHanlder"));
     2.8 +                        "enableCustomValueHandler"));
     2.9              }
    2.10          }
    2.11      }

mercurial