changeset 2373:4f7190b27caa jdk8u91-b14-aarch32-160510

Merge
author enevill
date Tue, 03 May 2016 10:55:58 +0100
parents 748d22a056d9 (current diff) 574417338118 (diff)
children 5c86aad667c7
files .hgtags
diffstat 2 files changed, 64 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Apr 15 11:22:34 2016 +0100
+++ b/.hgtags	Tue May 03 10:55:58 2016 +0100
@@ -355,6 +355,7 @@
 a198f93b1e0be5edce7a351b1399cb5c4e64c8f4 jdk8u31-b31
 99c79d83152585991682bd86e21fdcfe6f6ab9b2 jdk8u31-b32
 cf4ebf47413902376f66d2cddaf0282d49699ba7 jdk8u31-b33
+685af74060e723783f83c84040c04902674e2e1f jdk8u31-b34
 0dccc4aca1859b1ff7dca9db214f7f38c4ddbbce jdk8u40-b00
 f8736a40a35df0c8055c8a94b96e5381b381ad33 jdk8u40-b01
 b6a148730f2b14193c308bc9c866c36ee6c08ed3 jdk8u40-b02
@@ -426,6 +427,9 @@
 54b6481aa9e2f39699a96a4572b825b6d81f434f jdk8u51-b15
 3ee37a71b2ab50e1e47febab6b69771b6846ba6b jdk8u51-b16
 58f6ddf5d59fffc52d190d82890ba25698fb80e3 jdk8u51-b31
+3dcabe6d7fdd37e73ebdd82d414c4939a50b58b7 jdk8u51-b32
+586cfdfb13dd3f3b787d4fc1de7a03abd3a2457d jdk8u51-b33
+ad2f7ed088f1ce14564e573611c2d10635fbfab3 jdk8u51-b34
 ae4980d195b64eec58884b233d7efd312205bac8 jdk8u60-b00
 acf81f6fb265c1564b16fd8202a324a9022e204b jdk8u60-b01
 2ca2e2430370d441cbe7999b76b57cadf0060327 jdk8u60-b02
@@ -454,6 +458,8 @@
 be2ddf520d263ea27a075f895d93adada6702027 jdk8u60-b25
 d3bdbc19827e1a97e046b65e39cb9c7255d4603b jdk8u60-b26
 d50c3672fd185a4ca074c43d261edfcb1df7bc54 jdk8u60-b27
+cdc5223800ccf9607e19740d41429dacca03c623 jdk8u60-b31
+d7f8f147ff1d78987a4d963b2eda1477804cccec jdk8u60-b32
 45d4ff3a4f04fd676140bfe0a1b152618d684c9b jdk8u52-b06
 2b07cd3f89aab19a2f7f119f3d885b776342efcc jdk8u52-b07
 45d4ff3a4f04fd676140bfe0a1b152618d684c9b jdk8u65-b00
@@ -488,6 +494,29 @@
 d45e1dc28a6ee6fd03348ee170d9895957888124 jdk8u66-b15
 5f29f2da7993f09564f6a5cb34e2799981ea96bb jdk8u66-b16
 6eab3ce957aa560f8f9080a2c9535d1ee70fc834 jdk8u66-b17
+a482cd45f31d7bf4ffc77acace705a0b9f888489 jdk8u66-b18
+e6361dcd087eef288fdeeaa17c2dbf9aa4793d5d jdk8u66-b31
+b0bbac715f3bcefc57350b653decd9806144288a jdk8u66-b32
+75d6658e00b4115648b643dcad86a6879c9c94f3 jdk8u66-b33
+2a363653a0918df1eb369f6dc637258afeb6f7d1 jdk8u66-b34
+1719690a0ee77b273a487bcc4a38a721cee3785b jdk8u66-b35
+07707d0f0c781e37bc6897e9d89136e869840969 jdk8u66-b36
+ab2d570584a2bb01a6fedf7bd483443fdfc3d799 jdk8u71-b00
+1956eeeaed470cc9b46addabceb91c9900f2f83a jdk8u71-b01
+b9c864410397ae0e23219b8ab218c33c9859c592 jdk8u71-b02
+3ae95bcc5c89751e50c9181be12887ed6931e615 jdk8u71-b03
+1c87b989c16309652cec988e645dc7f277cfb56d jdk8u71-b04
+c70fdd779a6775bc5f90d60ff1feca2c90e3c2b7 jdk8u71-b05
+2c05fc89cda0befb802e838b442fc27d5b83980b jdk8u71-b06
+9b1bb13cc10cae3379849f341ccd0f21600de863 jdk8u71-b07
+0ed543b92df44dfcfbfd074b9d6461a50e5f198f jdk8u71-b08
+4231747bc5013bbead0cefa37ae4d2a390f2d446 jdk8u71-b09
+5b9d5e755832e86824826fda37c8e6ee4ed064f5 jdk8u71-b10
+4ad71baca90cbe089c121457a80f6693aa80b4e6 jdk8u71-b11
+4d09473111deb8fd6323df6f9e9536084cae2844 jdk8u71-b12
+4f9e7b1a4e04f2ae44c1f6501e4444b82c45afff jdk8u71-b13
+1397b1bae600666de90459de7fba3576bb99eeb8 jdk8u71-b14
+2e46e952ddd80370beee2f4f1b77efd0283d4049 jdk8u71-b15
 31a6e29ec33a9a3c6ac13ce66d3b96196700841c jdk8u72-b00
 d0afaafe3790d446d24ca35ddf61380457362b39 jdk8u72-b01
 2ffdd22b85317d3ba5ab28e34bcd288a5f18d998 jdk8u72-b02
@@ -496,3 +525,36 @@
 674a69ec28a9e62b1adc90b138a4957bbc82946c jdk8u72-b05
 e8bed1496ff254d91d52c8da7c6d8d361862d773 jdk8u76-b00
 84a69380750b4e1639efbeb790cda26b6ff9b75b jdk8u76-b00-aarch32-160415
+55c885702381d47704589a37f05c0f7045be4e36 jdk8u72-b08
+178589d241af764add3d4cbf6977945f65859c1d jdk8u72-b09
+bd25b660575f8ac3567b5ae2ac1e7f6b31df583e jdk8u72-b10
+3b454f1fb441a71836666b6727274a937249ca92 jdk8u72-b11
+e831ce671fb072501670ee593e1080659cbc9804 jdk8u72-b12
+8f5ca46a90af013525cbdf3b023727450cdb8119 jdk8u72-b13
+6cbd347daa9367b78e385f2e8eba222a30b3bea1 jdk8u72-b14
+fff0c11d2811deb70bef213d6d8478b3e3796658 jdk8u72-b15
+443abbc4e048b13e075486a86ddafca520257fdf jdk8u73-b00
+fc0ed68cbc5cbdb2efdb75f3309b5de2a64f5a57 jdk8u73-b01
+6aacbee7e4c84a30761faf58a682b07b8bdf54da jdk8u73-b02
+87614decb34cd6076f136b6d51be83f13e3e6aed jdk8u74-b00
+33b310c85259e0d7ed112ab2e01008228e263371 jdk8u74-b01
+bee679b986f51fe4d65d6df11fea93d1543b6502 jdk8u74-b02
+928374287059bb10b87dade1c2d984f8c4df01b3 jdk8u72-b31
+ac4e9dfd23236821432786b27566fa2f800aa3d4 jdk8u75-b00
+d63a77fb06149b75dbb043a175a9c4a906ac26ef jdk8u75-b01
+320f984ac52b56da66aff581a2c4830eadc0404e jdk8u75-b02
+53dc743a34f164a9eb4e336f90cb21a58291a0b1 jdk8u75-b03
+722fc7e276ff8b4b6460b399e4eb65da518435f0 jdk8u75-b04
+57f1232cccbdfb8716f7258bc42982eb3e236e51 jdk8u75-b05
+9ea73143a5184a4034a1276733a9f9f356b67278 jdk8u75-b06
+ab064675c0669fd31bc7c424611686fe73c1509f jdk8u75-b07
+af84471ad4fd4e474ce984440718d87a386df4a8 jdk8u75-b08
+22ba4f1ad75c80bf78539f4c80b9867d227184d3 jdk8u75-b09
+9da1d3f8905be682e33579857dd7b176f847e938 jdk8u75-b10
+d8708cd521ff11851b259cd1171e8f18b90564a1 jdk8u75-b12
+417ff12d11d60c7f2235b498fdea9ef85514fc75 jdk8u77-b00
+6683e1d7422d0b6fc6566a1454604ca1ba7e86d9 jdk8u77-b01
+7dd1be8bd46cd4c80526671607e8035c3c671c14 jdk8u77-b02
+3fbef9f4cddf934f9cc0e06f61e641b5b845b901 jdk8u77-b03
+4c41657db1862352b0e107b910be32c86eb5b1ff jdk8u91-b00
+0c798868f18548af144de0f0ab69f09a4c968cd2 jdk8u91-b13
--- a/make/Javadoc.gmk	Fri Apr 15 11:22:34 2016 +0100
+++ b/make/Javadoc.gmk	Tue May 03 10:55:58 2016 +0100
@@ -258,6 +258,8 @@
 with conceptual overviews, definitions of terms, workarounds, \
 and working code examples.<br>\
 $(call CopyrightLine,$(COPYRIGHT_URL),$(FIRST_COPYRIGHT_YEAR),)\
+Use is subject to <a href="http://download.oracle.com/otndocs/jcp/java_se-8-mrel-spec/license.html">license terms</a>. \
+Also see the <a target="_blank" href="http://www.oracle.com/technetwork/java/redist-137594.html">documentation redistribution policy</a>.\
 </font>
 
 # Common javadoc options used by all