changeset 1559:5c74a695b1ed jdk8u152-b16-aarch32-171102

Merge
author snazarki
date Thu, 02 Nov 2017 16:18:22 +0300
parents 072aec036673 674aecf3d87a
children 12d7b0e598c3
files .hgtags
diffstat 2 files changed, 39 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Nov 02 16:02:47 2017 +0300
+++ b/.hgtags	Thu Nov 02 16:18:22 2017 +0300
@@ -768,3 +768,30 @@
 05a4bb70c2d84442e505b40e2059399da3f65633 jdk8u151-b10
 ea10de07bc171c8cf89f2acbc4a1288d4dc0f2d6 jdk8u151-b11
 3647bb424be470a6c15cf03623e4ee3a67bc6e2c jdk8u151-b12-aarch32-171102
+87aaf4f5274e047cd1e0822a6b57dafcb987544b jdk8u151-b12
+58d0ffe75dc5597310d422e214dc077476bd2338 jdk8u122-b00
+a87b06da783bb5a11f7857220789979129e39e7c jdk8u122-b01
+8684348ae5eb6f895d19e4752dea567642dbcec4 jdk8u122-b02
+117a593d021502529821afbd7e0d695c170449f8 jdk8u122-b03
+117a593d021502529821afbd7e0d695c170449f8 jdk8u122-b03
+0000000000000000000000000000000000000000 jdk8u122-b03
+0000000000000000000000000000000000000000 jdk8u122-b03
+f8661a76fe475b1d7653493e407086830fde81f8 jdk8u122-b03
+7bd4195b17aa0a268eee4bc4b89f30ed3b096898 jdk8u122-b04
+f86d6064d7cfa022425c3df03d4335511ab33ecb jdk8u132-b00
+ea3d3c26102dcb82d9b140f729308395310dae7a jdk8u152-b00
+1819d008129b31df8c74b5d16e9daabc2bdcc10c jdk8u152-b01
+06f411ed0014d88050d9bd1e74c208a9fa3cfb6e jdk8u152-b02
+d36e9c6f195c5604626f7c836c17826960ca2a11 jdk8u152-b03
+4f94cc55256028ab54390abe212959c241b0670f jdk8u152-b04
+2917e61cfadab474625d19fb7775ccdec5584738 jdk8u152-b05
+bc6e4d3f7a20c34dcdccc1be17792188ccdcb917 jdk8u152-b06
+87992ac3484c6c2ae5cad4ad14701a03a9ec963c jdk8u152-b07
+1f7bbfb8b2632ac610c3a0d7d944ff0a3967469a jdk8u152-b08
+a9e83644bd11b5da49bb4424eed9c5a34003085c jdk8u152-b09
+3c302cc47b26715fb9ae863a477d6d0366feb713 jdk8u152-b10
+56a5346ca6448c188eb09de3856cbadf1532ffc4 jdk8u152-b11
+122a325c8bea6d8f49126ddc1644803d213197ae jdk8u152-b12
+f33390314a7d9311dc9474106ad6e66d71751e6d jdk8u152-b13
+2b4802994bf5a4a634258c9ff06d3da474130f8b jdk8u152-b14
+f89071fbde60b327d6940a34fcdeed96b6440dd2 jdk8u152-b15
--- a/ASSEMBLY_EXCEPTION	Thu Nov 02 16:02:47 2017 +0300
+++ b/ASSEMBLY_EXCEPTION	Thu Nov 02 16:18:22 2017 +0300
@@ -1,27 +1,27 @@
 
 OPENJDK ASSEMBLY EXCEPTION
 
-The OpenJDK source code made available by Sun at openjdk.java.net and
-openjdk.dev.java.net ("OpenJDK Code") is distributed under the terms of the
-GNU General Public License <http://www.gnu.org/copyleft/gpl.html> version 2
+The OpenJDK source code made available by Oracle America, Inc. (Oracle) at
+openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU
+General Public License <http://www.gnu.org/copyleft/gpl.html> version 2
 only ("GPL2"), with the following clarification and special exception.
 
     Linking this OpenJDK Code statically or dynamically with other code
     is making a combined work based on this library.  Thus, the terms
     and conditions of GPL2 cover the whole combination.
 
-    As a special exception, Sun gives you permission to link this
-    OpenJDK Code with certain code licensed by Sun as indicated at
+    As a special exception, Oracle gives you permission to link this
+    OpenJDK Code with certain code licensed by Oracle as indicated at
     http://openjdk.java.net/legal/exception-modules-2007-05-08.html
     ("Designated Exception Modules") to produce an executable,
     regardless of the license terms of the Designated Exception Modules,
     and to copy and distribute the resulting executable under GPL2,
     provided that the Designated Exception Modules continue to be
-    governed by the licenses under which they were offered by Sun.
+    governed by the licenses under which they were offered by Oracle.
 
-As such, it allows licensees and sublicensees of Sun's GPL2 OpenJDK Code to
-build an executable that includes those portions of necessary code that Sun
-could not provide under GPL2 (or that Sun has provided under GPL2 with the
-Classpath exception).  If you modify or add to the OpenJDK code, that new
-GPL2 code may still be combined with Designated Exception Modules if the
-new code is made subject to this exception by its copyright holder.
+As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code
+to build an executable that includes those portions of necessary code that
+Oracle could not provide under GPL2 (or that Oracle has provided under GPL2
+with the Classpath exception).  If you modify or add to the OpenJDK code,
+that new GPL2 code may still be combined with Designated Exception Modules
+if the new code is made subject to this exception by its copyright holder.