changeset 3675:21524ad5b914 icedtea-3.8.0 icedtea-3.9.0pre00

Merge jdk8u171-b11
author andrew
date Fri, 25 May 2018 01:50:13 +0100
parents 4a11d88aab1d (current diff) c9e49a425522 (diff)
children f395a6f610dc
files .hgtags
diffstat 2 files changed, 21 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Mar 27 18:24:52 2018 +0100
+++ b/.hgtags	Fri May 25 01:50:13 2018 +0100
@@ -809,6 +809,11 @@
 8c2463d627e3cf513522ba32bf71624c880beb91 jdk8u152-b15
 e32341052fe1cd792639b9e0ac48972a2e133a17 icedtea-3.7.0pre01
 97dfb267d417415aca378f62b97dbf7a12a93f8a jdk8u152-b16
+757f531633e3feb2d8c08b6afe748134e61ad917 jdk8u152-b31
+73ffe473564c8952813473078497a5e915655665 jdk8u152-b32
+5a188fbdf539e0b35a1f151e6b55b81ca102e4ab jdk8u152-b33
+e0481cb7000cdf63d8194eee25aa3931993b27b1 jdk8u152-b34
+f1fe0a49345b9aaa2874a0ec26ae9c775a5ba21d jdk8u152-b35
 4d69601f88c30e9f05e3b56c6d38a2f3eb47d477 jdk8u151-b00
 f081adae3486f8728affc89213c2cd1dd0ac9467 jdk8u151-b01
 732e1bab2660d21227dce26190d4a31dd9785a7f jdk8u151-b02
@@ -885,3 +890,16 @@
 29bd40939ca9433f1ab9dccc00d809c309427cce jdk8u162-b10
 f112f1acb17609cdd4151abf21f069d2bae24e99 jdk8u162-b11
 831896b367a4fb12630d9f040b49ebe9cf568ade icedtea-3.8.0pre01
+90286557058376d6c01260e3c192f76111f78b36 jdk8u162-b12
+07db50c5408300e6a56dcf0a5a74aad27616f36e jdk8u162-b31
+c18e76a704169bfdaeb498f6cb46c99251793e19 jdk8u171-b00
+64357fde9f88e1b462aaa19afff81abdcaace7bc jdk8u171-b01
+4cd77f7e459d629a2e352fc326cb56ce8fbf55bb jdk8u171-b02
+a459065c13afe9e0e122fa232f48ba95ab23d3f5 jdk8u171-b03
+c25be482f93d465d7a1fadf1df1428683d1b42fb jdk8u171-b04
+206179228d91783e943a857eec52a12b9985db2a jdk8u171-b05
+5e864878da0657b88c60a7f96774075e41f4fa59 jdk8u171-b06
+b85bfe8b37f328531ae5c65138e1e09df45c66aa jdk8u171-b07
+6f2f6a0c04c0ce37d42ce1f2657c7b5cf4286ca7 jdk8u171-b08
+bd20bc03808c33b2e8243e7cfd5b9826c6a24d26 jdk8u171-b09
+32a9ad19c92dae08f87048c8ae8c413325d4a128 jdk8u171-b10
--- a/test/tools/javap/T6587786.java	Tue Mar 27 18:24:52 2018 +0100
+++ b/test/tools/javap/T6587786.java	Fri May 25 01:50:13 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,6 +22,8 @@
  */
 
 /*
+ * @ignore  until JDK-8195589 is fixed
+ *
  * @test
  * @bug 6587786
  * @summary Javap throws error : "ERROR:Could not find <classname>" for JRE classes