# HG changeset patch # User asaha # Date 1507152797 25200 # Node ID 127419d98e7e30f666f4f7e595c53915dec01beb # Parent ae2ff3f896bbb9b4bde00352a37ca1ba071b35fa# Parent 06967271fe02e9e438a0d0c106cca665d387b6bd Merge diff -r ae2ff3f896bb -r 127419d98e7e .hgtags --- a/.hgtags Tue Oct 03 18:41:46 2017 -0700 +++ b/.hgtags Wed Oct 04 14:33:17 2017 -0700 @@ -712,6 +712,19 @@ 027f6df9fe82624fb7d489ffd848a26796de4868 jdk8u141-b15 4c355f7002c36bb626b42d5c1d42ea91d77ba5d6 jdk8u144-b00 816907853a15d9b22a87032d07327a400f8568b3 jdk8u144-b01 +4d69601f88c30e9f05e3b56c6d38a2f3eb47d477 jdk8u151-b00 +f081adae3486f8728affc89213c2cd1dd0ac9467 jdk8u151-b01 +732e1bab2660d21227dce26190d4a31dd9785a7f jdk8u151-b02 +a1d0ecd858bbc397f7683a9e0a3fd1620c327d64 jdk8u151-b03 +d0a51eb7da2995e864af5dc4d010aef0cb3f9e38 jdk8u151-b04 +e0ed0609963aca47e766901d7ec57ab97b649567 jdk8u151-b05 +ff824edbfa4dc81b6f2b5c33e4027806fd149304 jdk8u151-b06 +305472b39e966569e99a8b149543e3cd9160419c jdk8u151-b07 +bb3202444c4b86a63aaf68490f09ecf4bb1eff5f jdk8u151-b08 +c686a7fe765ec746c514618bae61dfc1570ce5b5 jdk8u151-b09 +8fb1d9ffc81c4bb6e08330726995b9b8f2b694a1 jdk8u151-b10 +607b049fabd1352893470463dfb455e0a407687d jdk8u151-b11 +8559c5805c2b091e2122dff3d04c7342cd15560c jdk8u151-b12 9a9ce479b92f1b4d9d436fb857d70c3d2b59a20c jdk8u122-b00 85d9e434701cc7112aaf965b0f5ee4b31ab2a445 jdk8u122-b01 2baeb96fa198f75e9bd50a5f5ef4a19be6cfbc4e jdk8u122-b02 @@ -728,5 +741,16 @@ 2783ff53e49dec0e7939b54aeb302605725e1017 jdk8u152-b03 71e344b8e2c237dd7ef7c5f4276030e2880a6e07 jdk8u152-b04 38bb14529d829cc290439a712b9821cd0e272f7e jdk8u152-b05 +243671be7d4e0a4f71c0f88add12695ac86295cb jdk8u152-b06 +a2cc6d348025da4b72c7b18edcc5fc9e046803da jdk8u152-b07 +19eec1de09c1fef1392593284eb9d2c5becd6663 jdk8u152-b08 +ca6375d1a8b2ba3c086746a2bca65015a1a12146 jdk8u152-b09 +abdab2b0bfdbda42030083e99e903bd663cafda3 jdk8u152-b10 +b0aba5c25f8b366fbe93ee19f2f60f863b603967 jdk8u152-b11 +b83ee184e012c5a4eb8989f55216d186d9f5aaaa jdk8u152-b12 +afbf7275401383d6dbbd54149a8985f510f57d7d jdk8u152-b13 +752a7260bb1977979243aa8dd9a588787237662e jdk8u152-b14 +8c2463d627e3cf513522ba32bf71624c880beb91 jdk8u152-b15 +97dfb267d417415aca378f62b97dbf7a12a93f8a jdk8u152-b16 6d21463aeffd526c9f7f5ce9a70ae7664235e125 jdk8u162-b00 9986bf97a48d3f2f16b90f2fb72e52b398202bd0 jdk8u162-b01 diff -r ae2ff3f896bb -r 127419d98e7e THIRD_PARTY_README --- a/THIRD_PARTY_README Tue Oct 03 18:41:46 2017 -0700 +++ b/THIRD_PARTY_README Wed Oct 04 14:33:17 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