# HG changeset patch # User asaha # Date 1424199815 28800 # Node ID 58ad5915b2b0d9c435baccea0e0bd0c73418fdb0 # Parent 4ee0e13da4023e100c047f5e1da4c0f6005c4b49# Parent 35d8318de0b6d4e68e2e0a04f6e20cafd113ca54 Merge diff -r 35d8318de0b6 -r 58ad5915b2b0 .hgtags --- a/.hgtags Mon Feb 16 11:05:03 2015 -0800 +++ b/.hgtags Tue Feb 17 11:03:35 2015 -0800 @@ -601,3 +601,4 @@ 3afa9cc6e8d537ee456b8e12d1abb1da520b5ddc jdk8u45-b06 5871f3dd9b4a2c4b44e7da2184f4430323e0c04b jdk8u45-b07 35c7330b68e21d0dfaaedaaf74b794fd10606e9c jdk8u45-b08 +b22b01407a8140041545afe1f2d6335db4d94ba5 jdk8u51-b00 diff -r 35d8318de0b6 -r 58ad5915b2b0 make/hotspot_version --- a/make/hotspot_version Mon Feb 16 11:05:03 2015 -0800 +++ b/make/hotspot_version Tue Feb 17 11:03:35 2015 -0800 @@ -34,8 +34,8 @@ HOTSPOT_VM_COPYRIGHT=Copyright 2015 HS_MAJOR_VER=25 -HS_MINOR_VER=45 -HS_BUILD_NUMBER=02 +HS_MINOR_VER=51 +HS_BUILD_NUMBER=01 JDK_MAJOR_VER=1 JDK_MINOR_VER=8