changeset 2244:4441d866400f jdk8u162-b02

Merge
author asaha
date Wed, 04 Oct 2017 14:33:44 -0700
parents 77c4b41ffb9a (current diff) 046ba9357cdc (diff)
children 791b290ffe4a
files .hgtags
diffstat 2 files changed, 42 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Oct 03 18:41:52 2017 -0700
+++ b/.hgtags	Wed Oct 04 14:33:44 2017 -0700
@@ -691,6 +691,46 @@
 dfb2e076f381c4ea8c84ae0309a2072ec3ac92b8 jdk8u141-b15
 6a52d202dfa3395d90cdd7dc24b8c437e5acc03d jdk8u144-b00
 7de0a688b0d910d4ef2cb89da6623b3ded431276 jdk8u144-b01
+6a5473932aff2d9c0df2cdc6e1800dd7c374232f jdk8u151-b00
+681ab42e7c73ba151256f88b7877f5ca4101e63d jdk8u151-b01
+296b5f81b2c28b5d7eea4a7051eae0ec34f5ec05 jdk8u151-b02
+c0828d5abc8646c80236fae42d971477bfc74748 jdk8u151-b03
+a593aff280ac5472a23923604f1a25c8e80e6ec7 jdk8u151-b04
+178207e92304e6717c1b2e80c56424efe4e69204 jdk8u151-b05
+b9ed966e2b873528553e27a791298205e1bc7cb5 jdk8u151-b06
+0e94fe02e7596493459317fe13a782c1a4daa1be jdk8u151-b07
+1f3aa2166cc45a091656795e0f022f2a049c6cae jdk8u151-b08
+34331f63b81e2a18c9241c762b9c92fd0bb8408e jdk8u151-b09
+f41afee891a32a88224317737b1eecbd735e7fd7 jdk8u151-b10
+a05eabdec5bb0133d6a8d0cf22f11c6e2a0d6b5d jdk8u151-b11
+dee0a16b2c50b99b0a232821861edc153f4f4937 jdk8u151-b12
+18eb73eb84c5395b3efcafa43ce224565eca02b3 jdk8u122-b00
+9e615ea961fe5732813ed7b273606e7337ea2234 jdk8u122-b01
+2f0b11882cb7ddb10e35682ab9e8343919a71c54 jdk8u122-b02
+df2a2824284f97c5edb9b9c2e6d18bb4ff838199 jdk8u122-b03
+df2a2824284f97c5edb9b9c2e6d18bb4ff838199 jdk8u122-b03
+0000000000000000000000000000000000000000 jdk8u122-b03
+0000000000000000000000000000000000000000 jdk8u122-b03
+12650d23a8fd1b27a0d28c6a276fdecf01805294 jdk8u122-b03
+3c3b4e793e7c6255a840844db077ef466940035c jdk8u122-b04
+30dc0c72f3d0aff34b6d421208b18f384d05d761 jdk8u132-b00
+91d33aea2714e63796eeab0e63e38c9d2568c00c jdk8u152-b00
+50dac2fd8689dbb820d887ce3919708d5d042891 jdk8u152-b01
+01bbd310156db7a75a46a7320d1f49beff844472 jdk8u152-b02
+2a01d94fea9a86b4038a93622f62b0986083f67e jdk8u152-b03
+9dce75561a92f096d822ebb7eb76810f191fe522 jdk8u152-b04
+cdb7d9454d254e95c73d6dc77077ab2c198e2ad6 jdk8u152-b05
+2be667f12b54fc5b57b147f60851ee63ff02e5fa jdk8u152-b06
+a44dcdfa00bee9261012f10bd3f06bea1fec4340 jdk8u152-b07
+d0a8151a276c362a6e17068d9aa8ed583309d46e jdk8u152-b08
+37e94d764d7b98e3676e54f2ad346d721fdde113 jdk8u152-b09
+b4f39fda3c39d41a33c9996555ddfd3200895756 jdk8u152-b10
+52485a7a9fc54a620a8a0568626087faf2bd63f9 jdk8u152-b11
+7d9cb98c7f071a7c0f6d430c6ec8116c8db34655 jdk8u152-b12
+293cf1e0a22791a96fe8e07f85af40f4dca64d1f jdk8u152-b13
+6025f8527d42706d171201f0a912c760d4d0c037 jdk8u152-b14
+a61136aa725ab8bb4721e8bb48aa827b49530978 jdk8u152-b15
+d0841bfdb637d83ee0066df2f730b8a9b6fc3450 jdk8u152-b16
 18eb73eb84c5395b3efcafa43ce224565eca02b3 jdk8u122-b00
 9e615ea961fe5732813ed7b273606e7337ea2234 jdk8u122-b01
 2f0b11882cb7ddb10e35682ab9e8343919a71c54 jdk8u122-b02
--- a/THIRD_PARTY_README	Tue Oct 03 18:41:52 2017 -0700
+++ b/THIRD_PARTY_README	Wed Oct 04 14:33:44 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