changeset 23496:c71344fad7a7

Merge
author asaha
date Tue, 28 Jul 2015 23:38:46 -0700
parents e30be4c0f1da (diff) 6594411c4eb4 (current diff)
children b057ebc2802f
files .hgtags make/hotspot_version
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Jul 28 23:17:54 2015 -0700
+++ b/.hgtags	Tue Jul 28 23:38:46 2015 -0700
@@ -733,3 +733,4 @@
 0366ad2644f58ec88af9cb2ea8c23a02559fb2d1 hs25.66-b02
 47110b037994f9006c22abcb12569fcafad84edb hs25.66-b03
 ae5624088d86abe8e7981dbb893c1b6da5140a1c jdk8u66-b02
+9a158a0c243beb610dbaabd63d6218d3ce5825f1 jdk8u71-b00
--- a/make/hotspot_version	Tue Jul 28 23:17:54 2015 -0700
+++ b/make/hotspot_version	Tue Jul 28 23:38:46 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