changeset 1491:463b5275e5ff

Merge
author asaha
date Thu, 08 Jun 2017 13:39:18 -0700
parents aed470d361fe 2e4373af86aa
children 4449c73dbfdf
files .hgtags
diffstat 2 files changed, 35 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Dec 13 12:50:58 2016 -0800
+++ b/.hgtags	Thu Jun 08 13:39:18 2017 -0700
@@ -700,11 +700,44 @@
 18bbb95d097e04ea2b88df8910056fe294da0149 jdk8u112-b14
 30f83ac389f06c38dc0b6f71b1d8344c01436a16 jdk8u112-b15
 8ef3cc2bbc7dc687e9502ae957337b1ded1b32d4 jdk8u112-b16
+7d4291146927c3430652a07f506d530c2eff7eb9 jdk8u112-b31
 3a25f8a752524bad7e78800158c485b890be3982 jdk8u121-b00
 1ebd97292358cd158b6f7d5884526207fbfe796e jdk8u121-b01
 349d130d7a7f2bcaaed8dd2696030022eb4e7b75 jdk8u121-b02
 2090928e4b80e849fff4797ee05b99c076f14667 jdk8u121-b03
 a80781c494079d7d92f806f1f4cf57e856435781 jdk8u121-b04
+cf1b7263a217eb891597aa5b64edde94970600c6 jdk8u121-b05
+f98001da328ffdb5de76c4ba6672f3bda4c22e51 jdk8u121-b06
+367d1b35f2b2ccf47ba0c1c565613c4741b58056 jdk8u121-b07
+43598d9344e383d039eabeb3ee59316d0cc3e4c6 jdk8u121-b08
+c0210b2071599fa54aec59576ca942461ed8160a jdk8u121-b09
+e24a55876a79b630e8cfca7a1b38a0ee372f8533 jdk8u121-b10
+acbfa2934b2411dd20aacb42d1c8dd198fe9f8e9 jdk8u121-b11
+cc9a5d631b77582d52aceaf6d6066e99533d1756 jdk8u121-b12
+386e9b79fcf5bfad5ff7b0fc991a7c6c5cbfed17 jdk8u121-b13
 e30c16839f2225d2fff653088636dafcb812cd4d jdk8u131-b00
+464cf9d3b00291fcf879ceca1b66bc7588093c47 jdk8u131-b01
+1656050026687c96900eed3b415d0ca1a0dc55b3 jdk8u131-b02
+495c4c5eeb9681438cb2d2d17b6d845e75b1d2fa jdk8u131-b03
+caab20741076e4d8d442657c6c0323565b312d03 jdk8u131-b04
+e77b6e1ec15770c4d92be14074af849323f91bf1 jdk8u131-b05
+1602920c0a18cb554c43f400f8b2f25d37162684 jdk8u131-b06
+4b61811293c92566eda15a13540fc2038a3add58 jdk8u131-b07
+05ea99eb62bf1bde12fca01c68213a36bb162264 jdk8u131-b08
+c5fd9c3a2eb12d366d59195dbea54c60db2a1df3 jdk8u131-b09
+de3c63a8b2e52d47554c999a65dbcec7f6d9c1be jdk8u131-b10
+2b88cb53e31fb637d7c37cc3414bb3eb3e9d1f0d jdk8u131-b11
 7056e474d6e3b7b3bac76bc35f8c4c321bf9abe9 jdk8u141-b00
+0f825574a7c8742494810d1f29193bfc3f1d370c jdk8u141-b01
+66d2dbe82668e425317ec0c421f5384399b220c9 jdk8u141-b02
+7316b3f30654a029024aab9f36ab814b44138e9d jdk8u141-b03
+68139c8638dc8038d3b5a3fcb41e4e314a95df1f jdk8u141-b04
+df048aacfa198bbfba66dae289dd0287627f5576 jdk8u141-b05
+608c9620655e56d96f741a68c214406740e48909 jdk8u141-b06
+3c2d6ed6d9ed7931eebe0a2a6e8ef7946409e7b7 jdk8u141-b07
+a88f33e068d46eb1d6206da5b4d87102b0107a43 jdk8u141-b08
+9947765c3f11e667a61abce6109d35d6d7f8bd6e jdk8u141-b09
+2dcbb77fb6d5ce03e3555f9d972b189b49a68e28 jdk8u141-b10
+f4091c5aed03f482ce64e406850b3ec6a7ed71ef jdk8u141-b11
+87a9107675a5a508d99a00f872f01e5bb42cfc02 jdk8u141-b12
 2dbdceff6ade82aa9942cdea6b62d5655d65183c jdk8u151-b00
--- a/THIRD_PARTY_README	Tue Dec 13 12:50:58 2016 -0800
+++ b/THIRD_PARTY_README	Thu Jun 08 13:39:18 2017 -0700
@@ -3318,12 +3318,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-2013 Jean-loup Gailly and Mark Adler