# HG changeset patch
# User dcubed
# Date 1467937324 25200
# Node ID 8aaca314f0a3caa50884b4a82f3263fd1b94845a
# Parent  25903fca58762a902995113c74027b7a6306fea0# Parent  98e223bbebceda5b2e03c5c77b9a18d9f9280c7d
Merge

diff -r 25903fca5876 -r 8aaca314f0a3 jdk/test/ProblemList.txt
--- a/jdk/test/ProblemList.txt	Thu Jun 30 14:57:30 2016 -0700
+++ b/jdk/test/ProblemList.txt	Thu Jul 07 17:22:04 2016 -0700
@@ -373,6 +373,8 @@
 
 sun/tools/jstatd/TestJstatdExternalRegistry.java                8046285 generic-all
 
+sun/tools/jps/TestJpsJar.java                                   8160923 generic-all
+
 sun/tools/jps/TestJpsJarRelative.java                           6456333 generic-all
 
 sun/tools/jinfo/JInfoRunningProcessFlagTest.java                6734748 generic-all