Merge

Wed, 28 May 2014 12:03:49 -0700

author
asaha
date
Wed, 28 May 2014 12:03:49 -0700
changeset 889
3826249b7b44
parent 886
90c4833e0f87
parent 888
3175dcbdd76e
child 890
31c368a27e6f
child 918
7193ccdc30ae

Merge

.hgtags file | annotate | diff | comparison | revisions
make/project.properties file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Tue May 20 12:01:45 2014 -0700
     1.2 +++ b/.hgtags	Wed May 28 12:03:49 2014 -0700
     1.3 @@ -267,6 +267,7 @@
     1.4  d9d482948b7c89161887b47e68e3367663d51b76 jdk8u11-b07
     1.5  a392513941025e2750acdcc45f9df2ec9080bde9 jdk8u11-b08
     1.6  dec6999877f39d3c17f7a092d8e2e17b676bb34b jdk8u11-b09
     1.7 +d522ff5f53730cabd02c1863bb9d437c13bcc5e0 jdk8u11-b10
     1.8  43a1183d2ab0ee3dbffd8bc47606e88dbe0c6116 jdk8u20-b02
     1.9  9d69311869d513deecfebe767cc5f01502c9c01e jdk8u20-b03
    1.10  e70dd55986e085185d976f2a78843a7d7eb87afd jdk8u20-b04
     2.1 --- a/make/project.properties	Tue May 20 12:01:45 2014 -0700
     2.2 +++ b/make/project.properties	Wed May 28 12:03:49 2014 -0700
     2.3 @@ -245,7 +245,7 @@
     2.4  test.src.dir=test/src
     2.5  
     2.6  # -Xmx is used for all tests, -Xms only for octane benchmark
     2.7 -run.test.xmx=3G
     2.8 +run.test.xmx=2G
     2.9  run.test.xms=2G
    2.10  
    2.11  run.test.user.language=tr

mercurial