# HG changeset patch # User asaha # Date 1437608825 25200 # Node ID 008b42595f2babc98e1b23bc00f27e308f9a35b9 # Parent 91a9961e3a21a7bdcd218d1ad658cacad60e0127# Parent f3d1f84b34f23b45a67337bf8796bc6bd836414a Merge diff -r f3d1f84b34f2 -r 008b42595f2b .hgtags --- a/.hgtags Wed Jul 22 16:23:26 2015 -0700 +++ b/.hgtags Wed Jul 22 16:47:05 2015 -0700 @@ -717,3 +717,12 @@ d89ceecf1bad55e1aee2932b8895d60fc64c15db hs25.60-b23 fb157d537278cda4150740e27bb57cd8694e15bf jdk8u60-b24 6b4ea38c01bd9cc86d0aa8926f4855ff6ee365ee jdk8u60-b25 +0219ab69f00782e5c49687e2fa75138a7ffddea1 jdk8u52-b06 +9b6f44853eed8caba935915c7e710c546b205c8e jdk8u52-b07 +0219ab69f00782e5c49687e2fa75138a7ffddea1 jdk8u65-b00 +b6815d853c359be92e61f422ea5018af1f81d0c7 jdk8u65-b01 +488661b9cbdaeb24be14873f3bd39a945575692a jdk8u65-b02 +ea47136e6ea4253c0bf238fb61760f98a8d01ebc jdk8u65-b03 +2a03fd592fe60fd113c1c89e431ebaa6857c4998 jdk8u65-b04 +aa915217a00c4b8ce0e82d1b23fa1df8a9e4cc70 jdk8u65-b05 +3070e116da4cfebc2ceb0df8f40faeefd38a6d4a jdk8u65-b06 diff -r f3d1f84b34f2 -r 008b42595f2b make/hotspot_version --- a/make/hotspot_version Wed Jul 22 16:23:26 2015 -0700 +++ b/make/hotspot_version Wed Jul 22 16:47:05 2015 -0700 @@ -34,8 +34,8 @@ HOTSPOT_VM_COPYRIGHT=Copyright 2015 HS_MAJOR_VER=25 -HS_MINOR_VER=60 -HS_BUILD_NUMBER=23 +HS_MINOR_VER=65 +HS_BUILD_NUMBER=01 JDK_MAJOR_VER=1 JDK_MINOR_VER=8