Merge jdk8u172-b06

Tue, 13 Feb 2018 12:30:19 -0800

author
asaha
date
Tue, 13 Feb 2018 12:30:19 -0800
changeset 3589
f16940263af4
parent 3586
e5fb3c88a9cd
parent 3588
b85bfe8b37f3
child 3590
d4daa5225bc7

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Tue Feb 06 11:14:28 2018 -0800
     1.2 +++ b/.hgtags	Tue Feb 13 12:30:19 2018 -0800
     1.3 @@ -857,6 +857,7 @@
     1.4  a459065c13afe9e0e122fa232f48ba95ab23d3f5 jdk8u171-b03
     1.5  c25be482f93d465d7a1fadf1df1428683d1b42fb jdk8u171-b04
     1.6  206179228d91783e943a857eec52a12b9985db2a jdk8u171-b05
     1.7 +5e864878da0657b88c60a7f96774075e41f4fa59 jdk8u171-b06
     1.8  53092d863cb60907700ac5fd7d12fc28ce871b2a jdk8u172-b00
     1.9  47a91ecb0b875b8c03c335e11bfe5052bad4f1cf jdk8u172-b01
    1.10  989188d1a978fea3255e733c89718b8c0b21a231 jdk8u172-b02
     2.1 --- a/test/tools/javap/T6587786.java	Tue Feb 06 11:14:28 2018 -0800
     2.2 +++ b/test/tools/javap/T6587786.java	Tue Feb 13 12:30:19 2018 -0800
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
     2.6 + * Copyright (c) 2008, 2018, 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 @@ -22,6 +22,8 @@
    2.11   */
    2.12  
    2.13  /*
    2.14 + * @ignore  until JDK-8195589 is fixed
    2.15 + *
    2.16   * @test
    2.17   * @bug 6587786
    2.18   * @summary Javap throws error : "ERROR:Could not find <classname>" for JRE classes

mercurial