Merge jdk8u171-b01

Thu, 21 Dec 2017 13:49:12 -0800

author
asaha
date
Thu, 21 Dec 2017 13:49:12 -0800
changeset 3573
64357fde9f88
parent 3563
ca57ac39feed
parent 3572
07db50c54083
child 3574
c9b1ccb4ec27

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Thu Nov 02 11:44:08 2017 -0700
     1.2 +++ b/.hgtags	Thu Dec 21 13:49:12 2017 -0800
     1.3 @@ -772,6 +772,11 @@
     1.4  752a7260bb1977979243aa8dd9a588787237662e jdk8u152-b14
     1.5  8c2463d627e3cf513522ba32bf71624c880beb91 jdk8u152-b15
     1.6  97dfb267d417415aca378f62b97dbf7a12a93f8a jdk8u152-b16
     1.7 +757f531633e3feb2d8c08b6afe748134e61ad917 jdk8u152-b31
     1.8 +73ffe473564c8952813473078497a5e915655665 jdk8u152-b32
     1.9 +5a188fbdf539e0b35a1f151e6b55b81ca102e4ab jdk8u152-b33
    1.10 +e0481cb7000cdf63d8194eee25aa3931993b27b1 jdk8u152-b34
    1.11 +f1fe0a49345b9aaa2874a0ec26ae9c775a5ba21d jdk8u152-b35
    1.12  4d69601f88c30e9f05e3b56c6d38a2f3eb47d477 jdk8u151-b00
    1.13  f081adae3486f8728affc89213c2cd1dd0ac9467 jdk8u151-b01
    1.14  732e1bab2660d21227dce26190d4a31dd9785a7f jdk8u151-b02
    1.15 @@ -825,10 +830,24 @@
    1.16  a9ed1dba7dd19b8886b6fd0e6fde3e1ef1a78789 jdk8u161-b03
    1.17  17507635a86dd95b0a76a59e8ff80d92510844df jdk8u161-b04
    1.18  102179740625431f80fb33c078b344c771528daa jdk8u161-b05
    1.19 +9d6ebf514475c90019ed352bf207ca28e3f294af jdk8u161-b06
    1.20 +cb6f7d27f97c64fe4076e321a6e49cf2dc40f939 jdk8u161-b07
    1.21 +36cd8cee9f0cf803923fb310d9fe4362787f750e jdk8u161-b08
    1.22 +96cdc8b62d5f7263a0c42bc21bf85a205cb75ebb jdk8u161-b09
    1.23 +cfc40ab214f9174edbb08925a39efd081d6e4b34 jdk8u161-b10
    1.24 +44fd88d9e5ae96d54e6d993dae14d6f2ab53b5c1 jdk8u161-b11
    1.25 +cc28ef580ec551df5338083eb9365b923bceedf4 jdk8u161-b12
    1.26  6d21463aeffd526c9f7f5ce9a70ae7664235e125 jdk8u162-b00
    1.27  9986bf97a48d3f2f16b90f2fb72e52b398202bd0 jdk8u162-b01
    1.28  127419d98e7e30f666f4f7e595c53915dec01beb jdk8u162-b02
    1.29  9c3d2bd8e3dff93bb572522e972de9cce95f3024 jdk8u162-b03
    1.30  a53904e332953e428901e9330d2d4418a3f9c249 jdk8u162-b04
    1.31  b7139bbfb407f9973a7563f9bd2e1e446b330ee8 jdk8u162-b05
    1.32 +91a05c239f639a72f4b56e64b58585538a3773b7 jdk8u162-b06
    1.33 +fec3ee6be9177021ee1d2675a5ee3f603e1bbcae jdk8u162-b07
    1.34 +30b1ef9951c21562a45c75d9a9a964d601c08b02 jdk8u162-b08
    1.35 +e856f66901b181604c72bb8fcc7b9e746ee4593a jdk8u162-b09
    1.36 +29bd40939ca9433f1ab9dccc00d809c309427cce jdk8u162-b10
    1.37 +f112f1acb17609cdd4151abf21f069d2bae24e99 jdk8u162-b11
    1.38 +90286557058376d6c01260e3c192f76111f78b36 jdk8u162-b12
    1.39  c18e76a704169bfdaeb498f6cb46c99251793e19 jdk8u171-b00
     2.1 --- a/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties	Thu Nov 02 11:44:08 2017 -0700
     2.2 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties	Thu Dec 21 13:49:12 2017 -0800
     2.3 @@ -1,5 +1,5 @@
     2.4  #
     2.5 -# Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
     2.6 +# Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
     2.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8  #
     2.9  # This code is free software; you can redistribute it and/or modify it
    2.10 @@ -639,10 +639,10 @@
    2.11  compiler.err.repeated.modifier=\u4FEE\u9970\u7B26\u91CD\u590D
    2.12  
    2.13  # 0: symbol, 1: set of modifier, 2: symbol
    2.14 -compiler.err.report.access={0}\u53EF\u4EE5\u5728{2}\u4E2D\u8BBF\u95EE{1}
    2.15 +compiler.err.report.access={0} \u5728 {2} \u4E2D\u662F {1} \u8BBF\u95EE\u63A7\u5236
    2.16  
    2.17  # 0: symbol, 1: set of modifier, 2: symbol
    2.18 -compiler.misc.report.access={0}\u53EF\u4EE5\u5728{2}\u4E2D\u8BBF\u95EE{1}
    2.19 +compiler.misc.report.access={0} \u5728 {2} \u4E2D\u662F {1} \u8BBF\u95EE\u63A7\u5236
    2.20  
    2.21  compiler.err.ret.outside.meth=\u8FD4\u56DE\u5916\u90E8\u65B9\u6CD5
    2.22  

mercurial