# HG changeset patch # User asaha # Date 1443480478 25200 # Node ID 1a799d49de23d84f658ade1d3805a1924e7e1e84 # Parent 70579df928a5633516483b27ecfa7940470b6bb3# Parent 0ff90c97d892396090fa0a03a72228b9b1860e73 Merge diff -r 0ff90c97d892 -r 1a799d49de23 .hgtags --- a/.hgtags Mon Sep 28 15:40:39 2015 -0700 +++ b/.hgtags Mon Sep 28 15:47:58 2015 -0700 @@ -759,3 +759,5 @@ 9f7f29ff487ae023ca1f697445004a532751b0d2 jdk8u66-b14 5b67af3317bce1f940c5dc1535411a1002bed6c1 jdk8u66-b15 4bbf0e9196f2786e0bc4f17664e2533808d944bf jdk8u66-b16 +9a158a0c243beb610dbaabd63d6218d3ce5825f1 jdk8u71-b00 +67df26e363fb7e722032fd286673642fc999957c jdk8u71-b01 diff -r 0ff90c97d892 -r 1a799d49de23 make/hotspot_version --- a/make/hotspot_version Mon Sep 28 15:40:39 2015 -0700 +++ b/make/hotspot_version Mon Sep 28 15:47:58 2015 -0700 @@ -31,11 +31,11 @@ # # Don't put quotes (fail windows build). -HOTSPOT_VM_COPYRIGHT=Copyright 2015 +HOTSPOT_VM_COPYRIGHT=Copyright 2016 HS_MAJOR_VER=25 -HS_MINOR_VER=66 -HS_BUILD_NUMBER=00 +HS_MINOR_VER=71 +HS_BUILD_NUMBER=01 JDK_MAJOR_VER=1 JDK_MINOR_VER=8