changeset 23128:0b3f44955388 jdk8u51-b04

Merge
author asaha
date Tue, 17 Mar 2015 11:42:30 -0700
parents b3726a400905 (diff) 894b92a02c53 (current diff)
children 6ce994385353
files .hgtags
diffstat 2 files changed, 6 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Mar 17 11:34:42 2015 -0700
+++ b/.hgtags	Tue Mar 17 11:42:30 2015 -0700
@@ -597,35 +597,6 @@
 6824e2475e0432e27f9cc51838bc34ea5fbf5113 jdk8u40-b27
 8220f68a195f6eeed2f5fb6e8a303726b512e899 jdk8u40-b31
 850a290eb1088a61178d1910c500e170ef4f4386 jdk8u40-b32
-1b3abbeee961dee49780c0e4af5337feb918c555 jdk8u40-b10
-f10fe402dfb1543723b4b117a7cba3ea3d4159f1 hs25.40-b15
-99372b2fee0eb8b3452f47230e84aa6e97003184 jdk8u40-b11
-8b9ec2da541a74ac698560b6a2bc45fccb789919 hs25.40-b16
-6b93bf9ea3ea57ed0fe53cfedb2f9ab912c324e5 jdk8u40-b12
-521e269ae1daa9df1cb0835b97aa76bdf340fcb2 hs25.40-b17
-86307d47790785398d0695acc361bccaefe25f94 jdk8u40-b13
-4d5dc0d0f8799fafa1135d51d85edd4edd566501 hs25.40-b18
-b8ca8ec1daea70f7c0d519e866f9f147ec247055 jdk8u40-b14
-eb16b24e2eba9bdf04a9b377bebc2db9f713ff5e jdk8u40-b15
-3a8a0fd171c5876023112941b1c7254262f9adfc hs25.40-b19
-aa2442f89230dc46147c721812f3b3bd4c612e83 hs25.40-b20
-5ea68fb91139081304357f9b937f32c5fdfeca6d jdk8u40-b16
-6bf89bfe8185747a57193efb6cec1f17ccc80414 hs25.40-b21
-fc1f9b67fd8c5d5cd94ecc03569d93e7ce7fb574 jdk8u40-b17
-bc5a90a4db47f1c497d7894434c42325f595cd02 hs25.40-b22
-31d3306aad29e39929418ed43f28212a5f5306a3 jdk8u40-b18
-f8fc5cbe082ce0fb0c6c1dcd39493a16ed916353 hs25.40-b23
-d9349fa8822336e0244da0a8448f3e6b2d62741d jdk8u40-b19
-c3933f52eeb33f70ee562464edddfe9f01d944fd jdk8u40-b20
-d2e9a6bec4f2eec8506eed16f7324992a85d8480 hs25.40-b24
-25ec4a67433744bbe3406e5069e7fd1876ebbf2f jdk8u40-b21
-0f0cb4eeab2d871274f4ffdcd6017d2fdfa89238 hs25.40-b25
-0ee548a1cda08c884eccd563e2d5fdb6ee769b5a jdk8u40-b22
-0e67683b700174eab71ea205d1cfa4f1cf4523ba jdk8u40-b23
-fa4e797f61e6dda1a60e06944018213bff2a1b76 jdk8u40-b24
-698dd28ecc785ffc43e3f12266b13e85382c26a8 jdk8u40-b25
-f39b6944ad447269b81e06ca5da9edff9e9e67c8 jdk8u40-b26
-6824e2475e0432e27f9cc51838bc34ea5fbf5113 jdk8u40-b27
 b95f13f05f553309cd74d6ccf8fcedb259c6716c jdk8u45-b00
 41c3c456e326185053f0654be838f4b0bfb38078 jdk8u45-b01
 626fd8c2eec63e2a2dff3839bfe12c0431bf00a4 jdk8u45-b02
@@ -640,3 +611,7 @@
 f4822d12204179e6a3e7aaf98991b6171670cbf2 jdk8u45-b11
 dc29108bcbcbfcd49eaa9135368306dc85db73a6 jdk8u45-b12
 efbf340fc7f56e49735111c23cef030413146409 jdk8u45-b13
+b22b01407a8140041545afe1f2d6335db4d94ba5 jdk8u51-b00
+c1de2652a48c1d4a0c96707acc73db3cd317df2a jdk8u51-b01
+8f03c2f5fc170da5fca2cf65734941efb619feca jdk8u51-b02
+cf295659243009ded76b6c14307c177a02f9fe82 jdk8u51-b03
--- a/make/hotspot_version	Tue Mar 17 11:34:42 2015 -0700
+++ b/make/hotspot_version	Tue Mar 17 11:42:30 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