changeset 1999:af980289e0df jdk8u162-b02

Merge
author asaha
date Wed, 04 Oct 2017 14:20:23 -0700
parents 2272834baa05 01c1e35a6ade
children c6c15bd2fa20
files .hgtags
diffstat 3 files changed, 43 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Oct 03 18:40:20 2017 -0700
+++ b/.hgtags	Wed Oct 04 14:20:23 2017 -0700
@@ -710,6 +710,46 @@
 48a5a43b31970468f4fc0dc67b81e4ddeac1585f jdk8u141-b15
 9a342a4d909784cccb664f2293c8cb1463c3ac41 jdk8u144-b00
 57a5aae91b8bdccc4e1910cf373f13598429f03e jdk8u144-b01
+b85ec4e74ab5149adb30d993afbd517bd3df2a51 jdk8u151-b00
+0504d5c1c32696240cd1973bc79ab0dfcc59ee85 jdk8u151-b01
+9408ef2c7b205185aa5f9079fc44424328c64156 jdk8u151-b02
+66a82078ad5463ff048ec7b21405da3b5f62214a jdk8u151-b03
+6e00c7da6a32c0f750ccfbe4c71204eeb6cccc14 jdk8u151-b04
+6d4ab2046f26035e500924bffb49934d66aa64e3 jdk8u151-b05
+2edf82f6996ed27adb82dec2e3ce880134a98cc6 jdk8u151-b06
+9f271942852d8bc7de6c282307ffec3c92518f7d jdk8u151-b07
+1be5e74bfdf0c42ef5746b63b39a8ac139a063f7 jdk8u151-b08
+dd863a7bde3f0a335b99c9205af84a404fc55488 jdk8u151-b09
+af89399e4d1190c42e23b95da79800da51b40808 jdk8u151-b10
+ace131d990fdb75a6616f18265b2c4ecca2e3f5d jdk8u151-b11
+27cf3b1673624b3b9e246e526ba7848fa5f98400 jdk8u151-b12
+b94f31b809debc683b996146ac20acbb269381f9 jdk8u122-b00
+73494e6ff8e5a5a66cb87445d6c5a0a8acab3409 jdk8u122-b01
+89062b8ff53bfc62689c52373f5564369cd61609 jdk8u122-b02
+4cf57a6813323a1c3336bef63ca7c16d52146637 jdk8u122-b03
+4cf57a6813323a1c3336bef63ca7c16d52146637 jdk8u122-b03
+0000000000000000000000000000000000000000 jdk8u122-b03
+0000000000000000000000000000000000000000 jdk8u122-b03
+b6e27dc2775764b59755eb054c66fbec9b2684b7 jdk8u122-b03
+6dd80b19838ded52371aa280cb8a68ad80aed22d jdk8u122-b04
+1e501e6d58a962a1ef5dd933dc4cce56a5358a98 jdk8u132-b00
+d15b51f1149bd1b7e87f4ec6a1bc5678c15275ef jdk8u152-b00
+b6446826930c8577c7a90009dd472b7eb813e495 jdk8u152-b01
+d7045c4d4eab5eb23ed9e43a351ff1a497ba7a7e jdk8u152-b02
+0414b34a471e1c3d277a5b0e583c6bfd9708305c jdk8u152-b03
+ea8d7d26cccae878ffed38eaa3f3c49d74c891fd jdk8u152-b04
+c23b7c1c24bf06ffa1bd52f19d541a56cdb1b350 jdk8u152-b05
+ff59566476c79e8143bf18eefb79196cc3a12994 jdk8u152-b06
+c0a2f84796bc8a55bb686069114de60a7cc2c875 jdk8u152-b07
+8f1aee9f3d074e074b74fdd4c63d21c554295443 jdk8u152-b08
+88df79df1243571bbce3a8d4935ff7f25b9ade78 jdk8u152-b09
+336862c1e889840a37fe3b07eae2cd328382782d jdk8u152-b10
+075ea12bcfd50b6567f8fce95bfaec952dcdbda7 jdk8u152-b11
+b6d513f3cde1d8a7b81f769926e3d55b514696b2 jdk8u152-b12
+ec86194825dd0c2fc3d6ee88b287650e1c8e24c9 jdk8u152-b13
+c425fe56b8fb34e21a798be796305f51d648f11b jdk8u152-b14
+d680e12deacbc531fe647d356540384efe625223 jdk8u152-b15
+7a25d12cd94fa7a881f064dcb35f0e88ed073c45 jdk8u152-b16
 b94f31b809debc683b996146ac20acbb269381f9 jdk8u122-b00
 73494e6ff8e5a5a66cb87445d6c5a0a8acab3409 jdk8u122-b01
 89062b8ff53bfc62689c52373f5564369cd61609 jdk8u122-b02
--- a/THIRD_PARTY_README	Tue Oct 03 18:40:20 2017 -0700
+++ b/THIRD_PARTY_README	Wed Oct 04 14:20:23 2017 -0700
@@ -2808,12 +2808,12 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to zlib v1.2.8, which may be included 
+%% This notice is provided with respect to zlib v1.2.11, which may be included 
 with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
-  version 1.2.8, April 28th, 2013
+  version 1.2.11, January 15th, 2017
 
   Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
 
--- a/common/autoconf/generated-configure.sh	Tue Oct 03 18:40:20 2017 -0700
+++ b/common/autoconf/generated-configure.sh	Wed Oct 04 14:20:23 2017 -0700
@@ -3912,7 +3912,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1468207795
+DATE_WHEN_GENERATED=1500960571
 
 ###############################################################################
 #