# HG changeset patch
# User tschatzl
# Date 1403711027 0
# Node ID 883ad4669c9b640c435f76518ceaa46ba3ed421f
# Parent  5146d1e12a2fe48d289e89a715fc60053f203cfb# Parent  282191cd1bcc08f5f6d96db8be9b07c37b3f0eb5
Merge

diff -r 5146d1e12a2f -r 883ad4669c9b hotspot/test/gc/g1/TestSummarizeRSetStatsTools.java
--- a/hotspot/test/gc/g1/TestSummarizeRSetStatsTools.java	Wed Jun 25 16:53:13 2014 +0200
+++ b/hotspot/test/gc/g1/TestSummarizeRSetStatsTools.java	Wed Jun 25 15:43:47 2014 +0000
@@ -88,7 +88,6 @@
         ArrayList<String> finalargs = new ArrayList<String>();
         String[] defaultArgs = new String[] {
             "-XX:+UseG1GC",
-            "-XX:+UseCompressedOops",
             "-Xmn4m",
             "-Xmx20m",
             "-XX:InitiatingHeapOccupancyPercent=100", // we don't want the additional GCs due to initial marking