Merge

Thu, 08 Feb 2018 19:43:28 +0000

author
asaha
date
Thu, 08 Feb 2018 19:43:28 +0000
changeset 3659
92d0faef7acb
parent 3658
a654a0dc1da9
parent 3654
4a3ebb95eaaf
child 3663
15041b1f6e85

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Wed Feb 07 14:01:31 2018 -0800
     1.2 +++ b/.hgtags	Thu Feb 08 19:43:28 2018 +0000
     1.3 @@ -865,4 +865,5 @@
     1.4  989188d1a978fea3255e733c89718b8c0b21a231 jdk8u172-b02
     1.5  c563af72dd015eb3e528dbd121d23f0743276baa jdk8u172-b03
     1.6  2fefa5723300276ed0076e09d491622030105a25 jdk8u172-b04
     1.7 +a459065c13afe9e0e122fa232f48ba95ab23d3f5 jdk8u181-b00
     1.8  fc985725f819fe45abf54b0139b9aa3f34125189 jdk8u172-b05
     2.1 --- a/test/tools/javap/T6587786.java	Wed Feb 07 14:01:31 2018 -0800
     2.2 +++ b/test/tools/javap/T6587786.java	Thu Feb 08 19:43:28 2018 +0000
     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