changeset 7150:ad0cbda3bfa0

Merge
author asaha
date Thu, 22 Jan 2015 09:36:34 -0800
parents 9f5afbcc45ce 9da356c2ca06
children 6b8e200bdda1
files .hgtags make/hotspot_version
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Jan 19 12:28:21 2015 -0800
+++ b/.hgtags	Thu Jan 22 09:36:34 2015 -0800
@@ -590,3 +590,4 @@
 41c3c456e326185053f0654be838f4b0bfb38078 jdk8u45-b01
 626fd8c2eec63e2a2dff3839bfe12c0431bf00a4 jdk8u45-b02
 f41aa01b0a043611ee0abcb81a40f7d80085ec27 jdk8u45-b03
+b22b01407a8140041545afe1f2d6335db4d94ba5 jdk8u51-b00
--- a/make/hotspot_version	Mon Jan 19 12:28:21 2015 -0800
+++ b/make/hotspot_version	Thu Jan 22 09:36:34 2015 -0800
@@ -34,7 +34,7 @@
 HOTSPOT_VM_COPYRIGHT=Copyright 2015
 
 HS_MAJOR_VER=25
-HS_MINOR_VER=45
+HS_MINOR_VER=51
 HS_BUILD_NUMBER=01
 
 JDK_MAJOR_VER=1