changeset 1161:030b4033583a jdk8u66-b34

Merge
author asaha
date Fri, 13 Nov 2015 15:37:11 -0800
parents 4d8311cfab11 (diff) b766a3d91907 (current diff)
children dbd13a865569
files .hgtags
diffstat 2 files changed, 71 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Nov 11 20:45:47 2015 -0800
+++ b/.hgtags	Fri Nov 13 15:37:11 2015 -0800
@@ -428,3 +428,70 @@
 ef7893ef8718d205494fd5f79921be7c63b598b0 jdk8u51-b32
 e8631058a15d828af4d362cc247b18fc71aefeee jdk8u51-b33
 f806c42dad6de5d20652036de0f6964668435e11 jdk8u51-b34
+c8b402c28fe51e25f3298e1266f2ae48bda8d3e0 jdk8u60-b00
+7a0dacd12a9e42f581c11edeb51a69af9a8ab16d jdk8u60-b01
+5eb3236cc4a7075baf80fc8a258a1f9612e52cf0 jdk8u60-b02
+3e52068e8b9df8a9bb7a0594fab7f4132817ac3d jdk8u60-b03
+02b1d3c68132b14a36e5d1df9b4a53c7981469b4 jdk8u60-b04
+4dfd5dbd3014db59f92d54cf215f7e7ed4508044 jdk8u60-b05
+a22a9460d53fb519b00e118c98ee0cb5e981b659 jdk8u60-b06
+6f0885023e43fe44cade86e3dd77350d9ecbc4b4 jdk8u60-b07
+078fde829e878595fcd9122a52ea5cfafe6685a8 jdk8u60-b08
+fbb7b2d1321fdb7345e163bbc8c01a307f9d9d38 jdk8u60-b09
+3e7a28ca602befafcd6329a60c00e5b36c4e69c6 jdk8u60-b10
+334320b978e06d309d9a9ec67097f982128fad91 jdk8u60-b11
+fab06c192b0b246656e47aacab2fb555e3ca2cb7 jdk8u60-b12
+4390fe716719a6966e10bf9cce4b8752f9cf5d96 jdk8u60-b13
+feb70717506da80f712f0b942d77527d2cc4cde5 jdk8u60-b14
+8c0018c9c533126cf3f7e912936f6e227bd1e96c jdk8u60-b15
+1c9eb173022b4b95ef6c93685b62b3039ccf8d92 jdk8u60-b16
+d6a80a0a3e9aca2b40f80709c9ce6c471b8902cf jdk8u60-b17
+53361b1cead8fc5ab1619a0b3baec8d4b411319d jdk8u60-b18
+5b422975b71def8c5a16a4f303c8fb8b108dc0cf jdk8u60-b19
+1a4b2888aa98ea70aad849e35e05b48e1c107503 jdk8u60-b20
+a414aec2d19cf692310587518546842070b80cb8 jdk8u60-b21
+6079c26a3b8fa1ead3d26a9de6ade2af71f1fb94 jdk8u60-b22
+c21563403b7a043be3d8f1afdd314e91438e357c jdk8u60-b23
+1c394b3be96628b705bb78d62bb4b7c9a7f75175 jdk8u60-b24
+0497fdafbc8d19d72bce668e65dc5e5457f6f21a jdk8u60-b25
+a20f5fa8d56298239e762408d3a427a0632a8b69 jdk8u60-b26
+975eb04d17953228e0f401cfee657fa9f5e26915 jdk8u60-b27
+2ba41569e6a0d314333fc3d4375381fdde4de7ea jdk8u60-b31
+61c97f549df419ef128d56d830014c8c782f220e jdk8u60-b32
+b61213045ec6e71505dfb94d2cd4ae3ce866166b jdk8u52-b06
+45891cd5c7a2268c65e9b8ab9299d46c45c77c47 jdk8u52-b07
+b61213045ec6e71505dfb94d2cd4ae3ce866166b jdk8u65-b00
+2af4e64ba020ba1419f48ed901ba0c91ea6b0aa1 jdk8u65-b01
+0851a86980a752b2b0250f7aa8da0e95cd07520c jdk8u65-b02
+330a44775442aba19645e9de00f6e09e398493ac jdk8u65-b03
+8c449f659e1338f7360295659201e0f1f204b711 jdk8u65-b04
+34221564cc133b306fa2cbadea0524ccb6c11e78 jdk8u65-b05
+14a55d61e06e2c20cd108ff636d1b853f5c8749a jdk8u65-b06
+20c5aa28a5fdc1c2c57e9561b08efb1a054fea22 jdk8u65-b07
+7f5df082d224e558e546cfddaf0805d68f34b2e5 jdk8u65-b08
+fd04b18dbdd1cb6fd7a63f2719f74f9bd7f8131d jdk8u65-b09
+6adf33f124fdd40b0079013c1074b4c7fc24aae7 jdk8u65-b10
+0a351d11449f81065425154c679a255c7916cc6d jdk8u65-b11
+414bc42938220882d399efd347f249cdfa024a6a jdk8u65-b12
+0984b16cc4d5b787fe03a2c1385a02030e9178fc jdk8u65-b13
+55033df0bbba6593bca22a4552bffc014fc6fbf2 jdk8u65-b14
+4ccc9e1468ae438821c5774cfd92129c1cc7bc6e jdk8u65-b15
+8ad14ed35d90f80d747a807307aaf92b146f53a9 jdk8u65-b16
+dbdfb913c5284242da2f97c74d031f24719edf56 jdk8u65-b17
+6079c26a3b8fa1ead3d26a9de6ade2af71f1fb94 jdk8u66-b00
+9655502cb94fada4580aa1d8ac08ed027b2272ed jdk8u66-b01
+0357274e67e94963c226f98e3af535ada2c7e0c5 jdk8u66-b02
+c3801338e94e391e639602106f5a76c725f2bc6c jdk8u66-b07
+1f936b23f61914dc75c8b496ad6b13c453af81be jdk8u66-b08
+e294a428c36f3d405fb691bfa07905e76637412c jdk8u66-b09
+b30c137b45929ec5f300fa831eab49807f0fea0a jdk8u66-b10
+b4bf5b2e93a0ec26dfc70caebaeace3927243b19 jdk8u66-b11
+8ab75dba8353e1dd658e086de9c7ad1157d81cd7 jdk8u66-b12
+d0c6921ee6c88e050673cb9cf9f88b7159442c1c jdk8u66-b13
+972d89655bab60525ddbc9365354fc809d0b74ea jdk8u66-b14
+19e64af41036d4ba0109ac2838133de5e7d159cc jdk8u66-b15
+529e4f09082daa07610ddde7dd2bca35b979eb14 jdk8u66-b16
+78c988a427d751f5a986af258248b3665950e509 jdk8u66-b17
+f3c71687f52b6c4c331af8f6d200f677b367995c jdk8u66-b31
+7c9c036d03e18c44cf8598ce11c95764180eeed5 jdk8u66-b32
+032a4c3518f29ff55eac6603176e43601f7d0b4a jdk8u66-b33
--- a/THIRD_PARTY_README	Wed Nov 11 20:45:47 2015 -0800
+++ b/THIRD_PARTY_README	Fri Nov 13 15:37:11 2015 -0800
@@ -1140,37 +1140,6 @@
 
 --------------------------------------------------------------------------------
 
-%% This notice is provided with respect to JSON, which may be included 
-with JRE 8 & JDK 8.
-
---- begin of LICENSE ---
-
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
---- end of LICENSE ---
-
--------------------------------------------------------------------------------
-
 %% This notice is provided with respect to Kerberos functionality, which 
 which may be included with JRE 8, JDK 8, and OpenJDK 8.
 
@@ -1250,7 +1219,7 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to libpng 1.6.16, which may be
+%% This notice is provided with respect to libpng 1.6.16, which may be 
 included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
@@ -1370,7 +1339,7 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to libungif 4.1.3, which may be 
+%% This notice is provided with respect to GIFLIB 5.1.1 & libungif 4.1.3, which may be 
 included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
@@ -1399,13 +1368,13 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to Little CMS 2.5, which may be 
+%% This notice is provided with respect to Little CMS 2.7, which may be 
 included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
 Little CMS
-Copyright (c) 1998-2011 Marti Maria Saguer
+Copyright (c) 1998-2015 Marti Maria Saguer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal