changeset 12219:41e6ae9f6dd7

Merge
author zgu
date Wed, 18 Sep 2013 12:52:15 -0400
parents e42e456fbe6e (diff) 6f45933aef35 (current diff)
children cc5b40a76049 06ae47d9d088
files test/runtime/6878713/Test6878713.sh test/runtime/6878713/testcase.jar test/runtime/7020373/Test7020373.sh test/runtime/7020373/testcase.jar
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Sep 17 20:20:03 2013 +0200
+++ b/.hgtags	Wed Sep 18 12:52:15 2013 -0400
@@ -375,3 +375,5 @@
 18b4798adbc42c6fa16f5ecb7d5cd3ca130754bf hs25-b48
 aed585cafc0d9655726af6d1e1081d1c94cb3b5c jdk8-b106
 50794d8ac11c9579b41dec4de23b808fef9f34a1 hs25-b49
+5b7f90aab3ad25a25b75b7b2bb18d5ae23d8231c jdk8-b107
+a09fe9d1e016c285307507a5793bc4fa6215e9c9 hs25-b50
--- a/make/hotspot_version	Tue Sep 17 20:20:03 2013 +0200
+++ b/make/hotspot_version	Wed Sep 18 12:52:15 2013 -0400
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=25
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=50
+HS_BUILD_NUMBER=51
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8