# HG changeset patch
# User ddmitriev
# Date 1473257840 -7200
# Node ID d1d7b21e1abdeede87a102acbe3f82592fd97421
# Parent  c4a7c6d1cfb35b40e53a5d7654c3440f9cbb3693# Parent  8f3eb2bcd1a4ea4d461b2009c46e25096c7d8f10
Merge

diff -r c4a7c6d1cfb3 -r d1d7b21e1abd jdk/test/ProblemList.txt
--- a/jdk/test/ProblemList.txt	Wed Sep 07 07:21:43 2016 -0400
+++ b/jdk/test/ProblemList.txt	Wed Sep 07 16:17:20 2016 +0200
@@ -360,6 +360,8 @@
 
 sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java              8160376 macosx-all
 
+sun/tools/jps/TestJpsJar.java                                   8165500 generic-all
+
 sun/tools/jps/TestJpsJarRelative.java                           6456333 generic-all
 
 sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java    8057732 generic-all