# HG changeset patch
# User katleman
# Date 1372805755 25200
# Node ID a23062727b66ff310d702137f86a0c3298fab997
# Parent  6e13b5a2ca28c8bda3dac5a232f6917144360bc4# Parent  33f4497301dd95da94a2f4c4b1a519808302521e
Merge

diff -r 33f4497301dd -r a23062727b66 jdk/.hgtags
--- a/jdk/.hgtags	Fri Jun 28 16:26:36 2013 -0700
+++ b/jdk/.hgtags	Tue Jul 02 15:55:55 2013 -0700
@@ -217,3 +217,4 @@
 691d6c6cd332d98b0f0221445a73906776f31f72 jdk8-b93
 51479fa56b7c4363c6d87c2e8b898d8185cf4b22 jdk8-b94
 42aa9f1828852bb8b77e98ec695211493ae0759d jdk8-b95
+4a5d3cf2b3af1660db0237e8da324c140e534fa4 jdk8-b96
diff -r 33f4497301dd -r a23062727b66 jdk/test/ProblemList.txt
--- a/jdk/test/ProblemList.txt	Fri Jun 28 16:26:36 2013 -0700
+++ b/jdk/test/ProblemList.txt	Tue Jul 02 15:55:55 2013 -0700
@@ -137,6 +137,10 @@
 # 8015780
 java/lang/reflect/Method/GenericStringTest.java			generic-all
 
+# 8019500
+java/lang/management/MemoryMXBean/MemoryTestAllGC.sh            generic-all
+java/lang/management/MemoryMXBean/MemoryTest.java               generic-all
+
 ############################################################################
 
 # jdk_management