# HG changeset patch # User asaha # Date 1426027576 25200 # Node ID 79646da0f6cb1ea7c49eda32ad2e155a7e5debe6 # Parent 4bf3117ba80e306c58f1828e8599a531c21230ae# Parent 005fa3e7c7528e0955dc6820668e2b81bbac998a Merge diff -r 005fa3e7c752 -r 79646da0f6cb .hgtags --- a/.hgtags Tue Mar 10 15:33:50 2015 -0700 +++ b/.hgtags Tue Mar 10 15:46:16 2015 -0700 @@ -565,6 +565,7 @@ 4206e725d584be942c25ff46ff23d8e299ca4a4c jdk8u31-b13 b517d3a9aebf0fee64808f9a7c0ef8e0b82d5ed3 jdk8u31-b31 15d8108258cb60a58bdd03b9ff8e77dd6727a804 jdk8u31-b32 +26b1dc6891c4fae03575a9090f7d04bd631d9164 jdk8u31-b33 1b3abbeee961dee49780c0e4af5337feb918c555 jdk8u40-b10 f10fe402dfb1543723b4b117a7cba3ea3d4159f1 hs25.40-b15 99372b2fee0eb8b3452f47230e84aa6e97003184 jdk8u40-b11 @@ -605,3 +606,6 @@ 35d8318de0b6d4e68e2e0a04f6e20cafd113ca54 jdk8u45-b09 a9f5786079202b74b3651e1097c0b2341b2178b9 jdk8u45-b10 f4822d12204179e6a3e7aaf98991b6171670cbf2 jdk8u45-b11 +b22b01407a8140041545afe1f2d6335db4d94ba5 jdk8u51-b00 +c1de2652a48c1d4a0c96707acc73db3cd317df2a jdk8u51-b01 +8f03c2f5fc170da5fca2cf65734941efb619feca jdk8u51-b02 diff -r 005fa3e7c752 -r 79646da0f6cb make/hotspot_version --- a/make/hotspot_version Tue Mar 10 15:33:50 2015 -0700 +++ b/make/hotspot_version Tue Mar 10 15:46:16 2015 -0700 @@ -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