Merge

2 files changed, 32 insertions, 3 deletions

diff --git a/.hgtags b/.hgtags
index fcf0fb665..2ec54623a 100644
--- a/.hgtags
+++ b/.hgtags
@@ -566,6 +566,7 @@ e13839545238d1ecf17f0489bb6fb765de46719a jdk8u31-b12
 b517d3a9aebf0fee64808f9a7c0ef8e0b82d5ed3 jdk8u31-b31
 15d8108258cb60a58bdd03b9ff8e77dd6727a804 jdk8u31-b32
 26b1dc6891c4fae03575a9090f7d04bd631d9164 jdk8u31-b33
+70e73f8f43fc71c0629253e22121c974bfd79b86 jdk8u31-b34
 1b3abbeee961dee49780c0e4af5337feb918c555 jdk8u40-b10
 f10fe402dfb1543723b4b117a7cba3ea3d4159f1 hs25.40-b15
 99372b2fee0eb8b3452f47230e84aa6e97003184 jdk8u40-b11
@@ -667,6 +668,8 @@ a4eea4bee2d4fdb05f1a8358d70ec6adb1135526 jdk8u51-b14
 9a70cba6a3c3e44486f9c199d03a16b2b09d0a13 jdk8u51-b15
 3639e38bd73f5efa8ce092f0a745bb0c90759575 jdk8u51-b16
 20bad8c6c7b406c3603b4e22b15cd990840a9d62 jdk8u51-b31
+e51afd2a1fc17de59ff3c79003210a40a28ac960 jdk8u51-b32
+b2427357cc98aeb2716ee2e89e733794afb4057b jdk8u51-b33
 d9349fa8822336e0244da0a8448f3e6b2d62741d jdk8u60-b00
 d9349fa8822336e0244da0a8448f3e6b2d62741d hs25.60-b00
 ebf89088c08ab0508b9002b48dd3d68a340259af hs25.60-b01
@@ -720,6 +723,8 @@ fb157d537278cda4150740e27bb57cd8694e15bf jdk8u60-b24
 6b4ea38c01bd9cc86d0aa8926f4855ff6ee365ee jdk8u60-b25
 6a6759372807f49aa7a66ddc36aa91d6648d2097 jdk8u60-b26
 10ad4b9d79f98fa3545c88a342a68a80d198b808 jdk8u60-b27
+1f646daf0d673b0925da1ed7809d6bd097388ece jdk8u60-b31
+9bf9a733246b5e89986233f42a8e00c798ca703f jdk8u60-b32
 0219ab69f00782e5c49687e2fa75138a7ffddea1 jdk8u52-b06
 9b6f44853eed8caba935915c7e710c546b205c8e jdk8u52-b07
 0219ab69f00782e5c49687e2fa75138a7ffddea1 jdk8u65-b00
@@ -756,10 +761,34 @@ ab64d7ea4f48ea4bdbcc43d4a653be157d9c29e3 jdk8u66-b12
 5b67af3317bce1f940c5dc1535411a1002bed6c1 jdk8u66-b15
 4bbf0e9196f2786e0bc4f17664e2533808d944bf jdk8u66-b16
 a6f2a7ba281291f5dab79fa494f7cfaa6232c88b jdk8u66-b17
+9ae2a5adabba97d9ebf79e13b325f1ff368ce014 jdk8u66-b18
+527f62b70faee4a0c15f365def024b87012e6934 jdk8u66-b31
+9a158a0c243beb610dbaabd63d6218d3ce5825f1 jdk8u71-b00
+67df26e363fb7e722032fd286673642fc999957c jdk8u71-b01
+1a799d49de23d84f658ade1d3805a1924e7e1e84 jdk8u71-b02
+e06f49d82ef8128b3637937d383b6f0862650deb jdk8u71-b03
+7466029bf3cd3d5eea3055c4f790728263be4a2e jdk8u71-b04
+8a402d51763c083151d0cb434647bd6e1ba4353f jdk8u71-b05
+7dd34cca3538c9bef74a8a1976e14ca51e9857f9 jdk8u71-b06
+bf9d01d1dc6c58b52cb2d0fb07820c51b62c3827 jdk8u71-b07
+19d7052b56715803f40e39aaff00d34ca71f5bc3 jdk8u71-b08
+4fb1acaab7a3205277fa21b083694f1bbb9ae957 jdk8u71-b09
+db019338ef0b6c0ed98c4804c11e07fbee4c6b4c jdk8u71-b10
+9905af25dff7d5bbc73356f5bd14aa10f691a050 jdk8u71-b11
+8aeeda200ace7038e5420b3f27bdd2949abf1029 jdk8u71-b12
+9ba75ccbb03a597abf8d1d2ff5d1d12621725d48 jdk8u71-b13
 b8f426369187c32551f0a3d571d933908988c81c jdk8u72-b00
 c0205eddb31766ece562483595ec28a7506971e9 jdk8u72-b01
 15ef554f2f2e0a8d7c330191432fcd2126d19dab jdk8u72-b02
 bb98a4ba1556d0505461de98aa3dddf75278c09b jdk8u72-b03
 6c8ceb05ccf78f2f8f72f0870e3f6f3bd4895bb1 jdk8u72-b04
 a2969911663ab29c71a61aa3403e53243ad89923 jdk8u72-b05
+acf0d80cb84f14d787c34360abf2bc38b186999a jdk8u72-b06
+a382a72730f480078af5454afe782de9b6c210d3 jdk8u72-b07
+f26ad2273cd42cde957084ee953a9dc1a2598b5d jdk8u72-b08
+defd2b9a94584d372dea05272ad4f1d6a662c5d1 jdk8u72-b09
+78b0df74e3743be0b578c63e209a03685136d1fa jdk8u72-b10
+37a99b0f443e45fbd0b0a3ed844e6c97d661b754 jdk8u72-b11
+b8e7dd0e21173ad829b40361763d27cb6ac532e9 jdk8u72-b12
+a8e4754b89aecc388623394a20f6d43d4c58f083 jdk8u72-b13
 d7b01fb81aa8a5437cb03bc36afe15cf0e55fb89 jdk8u76-b00
diff --git a/make/hotspot_version b/make/hotspot_version
index b0b82b861..fb3b47b21 100644
--- a/make/hotspot_version
+++ b/make/hotspot_version
@@ -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