Mon, 09 Apr 2018 11:49:01 -0700
Merge
.hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Mon Jan 22 11:19:58 2018 -0800 1.2 +++ b/.hgtags Mon Apr 09 11:49:01 2018 -0700 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 @@ -845,8 +850,29 @@ 1.16 29bd40939ca9433f1ab9dccc00d809c309427cce jdk8u162-b10 1.17 f112f1acb17609cdd4151abf21f069d2bae24e99 jdk8u162-b11 1.18 90286557058376d6c01260e3c192f76111f78b36 jdk8u162-b12 1.19 +07db50c5408300e6a56dcf0a5a74aad27616f36e jdk8u162-b31 1.20 +c18e76a704169bfdaeb498f6cb46c99251793e19 jdk8u171-b00 1.21 +64357fde9f88e1b462aaa19afff81abdcaace7bc jdk8u171-b01 1.22 +4cd77f7e459d629a2e352fc326cb56ce8fbf55bb jdk8u171-b02 1.23 +a459065c13afe9e0e122fa232f48ba95ab23d3f5 jdk8u171-b03 1.24 +c25be482f93d465d7a1fadf1df1428683d1b42fb jdk8u171-b04 1.25 +206179228d91783e943a857eec52a12b9985db2a jdk8u171-b05 1.26 +5e864878da0657b88c60a7f96774075e41f4fa59 jdk8u171-b06 1.27 +b85bfe8b37f328531ae5c65138e1e09df45c66aa jdk8u171-b07 1.28 +6f2f6a0c04c0ce37d42ce1f2657c7b5cf4286ca7 jdk8u171-b08 1.29 +bd20bc03808c33b2e8243e7cfd5b9826c6a24d26 jdk8u171-b09 1.30 +32a9ad19c92dae08f87048c8ae8c413325d4a128 jdk8u171-b10 1.31 +c9e49a425522f90456701e11db13e3ebc9f3939f jdk8u171-b11 1.32 53092d863cb60907700ac5fd7d12fc28ce871b2a jdk8u172-b00 1.33 47a91ecb0b875b8c03c335e11bfe5052bad4f1cf jdk8u172-b01 1.34 989188d1a978fea3255e733c89718b8c0b21a231 jdk8u172-b02 1.35 c563af72dd015eb3e528dbd121d23f0743276baa jdk8u172-b03 1.36 +2fefa5723300276ed0076e09d491622030105a25 jdk8u172-b04 1.37 +fc985725f819fe45abf54b0139b9aa3f34125189 jdk8u172-b05 1.38 +f16940263af472cc263f6e00b94841b867ec9a6d jdk8u172-b06 1.39 +602e04c71a86643230877f17321ac932cf91034c jdk8u172-b07 1.40 +44a8be4e5ab09cde08ee5a9b7599640d5acc5a43 jdk8u172-b08 1.41 +3f86a51255225110eea453dd260cc4e783607a0d jdk8u172-b09 1.42 +1c96dd3f4f1032dd1123c361faa73656f68c0238 jdk8u172-b10 1.43 +2c9cfdb5286826d9f176d79086d58ddb0bd61333 jdk8u172-b11 1.44 aee7802a04daf266caadc5742737bdd7d9a17937 jdk8u182-b00
2.1 --- a/test/tools/javap/T6587786.java Mon Jan 22 11:19:58 2018 -0800 2.2 +++ b/test/tools/javap/T6587786.java Mon Apr 09 11:49:01 2018 -0700 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