# HG changeset patch
# User asaha
# Date 1401303829 25200
# Node ID 3826249b7b44e968a1d8f3407f4176405fcf7937
# Parent  90c4833e0f87aca889905ffdd6bf942087dd78c7# Parent  3175dcbdd76ee9272276fa756247203dffb20596
Merge

diff -r 90c4833e0f87 -r 3826249b7b44 .hgtags
--- a/.hgtags	Tue May 20 12:01:45 2014 -0700
+++ b/.hgtags	Wed May 28 12:03:49 2014 -0700
@@ -267,6 +267,7 @@
 d9d482948b7c89161887b47e68e3367663d51b76 jdk8u11-b07
 a392513941025e2750acdcc45f9df2ec9080bde9 jdk8u11-b08
 dec6999877f39d3c17f7a092d8e2e17b676bb34b jdk8u11-b09
+d522ff5f53730cabd02c1863bb9d437c13bcc5e0 jdk8u11-b10
 43a1183d2ab0ee3dbffd8bc47606e88dbe0c6116 jdk8u20-b02
 9d69311869d513deecfebe767cc5f01502c9c01e jdk8u20-b03
 e70dd55986e085185d976f2a78843a7d7eb87afd jdk8u20-b04
diff -r 90c4833e0f87 -r 3826249b7b44 make/project.properties
--- a/make/project.properties	Tue May 20 12:01:45 2014 -0700
+++ b/make/project.properties	Wed May 28 12:03:49 2014 -0700
@@ -245,7 +245,7 @@
 test.src.dir=test/src
 
 # -Xmx is used for all tests, -Xms only for octane benchmark
-run.test.xmx=3G
+run.test.xmx=2G
 run.test.xms=2G
 
 run.test.user.language=tr