# HG changeset patch # User asaha # Date 1431047623 25200 # Node ID 89174fe1856f19204a9d7daa102b23ab74e25e40 # Parent 1d432458e33e75b9526d458d31f54738f6b6dcc5# Parent 50dd41280ebe576956a0b89e4c395ebbd4adb747 Merge diff -r 50dd41280ebe -r 89174fe1856f .hgtags --- a/.hgtags Wed May 06 10:59:06 2015 -0700 +++ b/.hgtags Thu May 07 18:13:43 2015 -0700 @@ -658,3 +658,6 @@ ce81c4487dd1e9f89d4570a8cd25e349f6bae00d jdk8u51-b09 928e1994ad43272f808ca22b9cc1b08a7ce2824f jdk8u51-b10 1a122beb9dc6881850ef1d1250f40a83709b8b72 jdk8u51-b11 +0219ab69f00782e5c49687e2fa75138a7ffddea1 jdk8u52-b06 +9b6f44853eed8caba935915c7e710c546b205c8e jdk8u52-b07 +0219ab69f00782e5c49687e2fa75138a7ffddea1 jdk8u65-b00 diff -r 50dd41280ebe -r 89174fe1856f make/hotspot_version --- a/make/hotspot_version Wed May 06 10:59:06 2015 -0700 +++ b/make/hotspot_version Thu May 07 18:13:43 2015 -0700 @@ -34,8 +34,8 @@ HOTSPOT_VM_COPYRIGHT=Copyright 2015 HS_MAJOR_VER=25 -HS_MINOR_VER=51 -HS_BUILD_NUMBER=02 +HS_MINOR_VER=65 +HS_BUILD_NUMBER=01 JDK_MAJOR_VER=1 JDK_MINOR_VER=8