changeset 3661:92d0faef7acb

Merge
author asaha
date Thu, 08 Feb 2018 19:43:28 +0000
parents a654a0dc1da9 4a3ebb95eaaf
children 15041b1f6e85
files .hgtags
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Feb 07 14:01:31 2018 -0800
+++ b/.hgtags	Thu Feb 08 19:43:28 2018 +0000
@@ -865,4 +865,5 @@
 989188d1a978fea3255e733c89718b8c0b21a231 jdk8u172-b02
 c563af72dd015eb3e528dbd121d23f0743276baa jdk8u172-b03
 2fefa5723300276ed0076e09d491622030105a25 jdk8u172-b04
+a459065c13afe9e0e122fa232f48ba95ab23d3f5 jdk8u181-b00
 fc985725f819fe45abf54b0139b9aa3f34125189 jdk8u172-b05
--- a/test/tools/javap/T6587786.java	Wed Feb 07 14:01:31 2018 -0800
+++ b/test/tools/javap/T6587786.java	Thu Feb 08 19:43:28 2018 +0000
@@ -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