changeset 1987:b6d513f3cde1 jdk8u152-b12

Merge
author asaha
date Tue, 15 Aug 2017 13:30:22 -0700
parents bc4386f5071d af89399e4d11
children 7cefc0daedee
files .hgtags
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Aug 08 10:04:22 2017 -0700
+++ b/.hgtags	Tue Aug 15 13:30:22 2017 -0700
@@ -719,6 +719,7 @@
 2edf82f6996ed27adb82dec2e3ce880134a98cc6 jdk8u151-b06
 9f271942852d8bc7de6c282307ffec3c92518f7d jdk8u151-b07
 1be5e74bfdf0c42ef5746b63b39a8ac139a063f7 jdk8u151-b08
+dd863a7bde3f0a335b99c9205af84a404fc55488 jdk8u151-b09
 b94f31b809debc683b996146ac20acbb269381f9 jdk8u122-b00
 73494e6ff8e5a5a66cb87445d6c5a0a8acab3409 jdk8u122-b01
 89062b8ff53bfc62689c52373f5564369cd61609 jdk8u122-b02
--- a/THIRD_PARTY_README	Tue Aug 08 10:04:22 2017 -0700
+++ b/THIRD_PARTY_README	Tue Aug 15 13:30:22 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