# HG changeset patch
# User asaha
# Date 1518553819 28800
# Node ID f16940263af472cc263f6e00b94841b867ec9a6d
# Parent  e5fb3c88a9cdc417638640a8ff58f4e5925dc598# Parent  b85bfe8b37f328531ae5c65138e1e09df45c66aa
Merge

diff -r e5fb3c88a9cd -r f16940263af4 .hgtags
--- a/.hgtags	Tue Feb 06 11:14:28 2018 -0800
+++ b/.hgtags	Tue Feb 13 12:30:19 2018 -0800
@@ -857,6 +857,7 @@
 a459065c13afe9e0e122fa232f48ba95ab23d3f5 jdk8u171-b03
 c25be482f93d465d7a1fadf1df1428683d1b42fb jdk8u171-b04
 206179228d91783e943a857eec52a12b9985db2a jdk8u171-b05
+5e864878da0657b88c60a7f96774075e41f4fa59 jdk8u171-b06
 53092d863cb60907700ac5fd7d12fc28ce871b2a jdk8u172-b00
 47a91ecb0b875b8c03c335e11bfe5052bad4f1cf jdk8u172-b01
 989188d1a978fea3255e733c89718b8c0b21a231 jdk8u172-b02
diff -r e5fb3c88a9cd -r f16940263af4 test/tools/javap/T6587786.java
--- a/test/tools/javap/T6587786.java	Tue Feb 06 11:14:28 2018 -0800
+++ b/test/tools/javap/T6587786.java	Tue Feb 13 12:30:19 2018 -0800
@@ -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