Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jdk8-b05
authorduke
Wed, 05 Jul 2017 17:50:24 +0200
changeset 10400 c4f9ea1ecb55
parent 10399 fc13a4229f74 (diff)
parent 10384 4542f486baba (current diff)
child 10401 49c33dd39bba
child 10402 f6b03ab4a2b6
child 10403 d062411f33d7
child 10405 5489308cf366
child 10445 553337da9f77
child 10447 301b3b8fc6aa
child 10449 3632c6a1c35c
child 10451 a96dd6407bc9
child 10460 eb60c4f9512e
child 10484 755544c425e2
child 10532 d41efe93a674
child 10706 9bd5de10aaf9
Merge
--- a/.hgtags-top-repo	Wed Jul 05 17:50:00 2017 +0200
+++ b/.hgtags-top-repo	Wed Jul 05 17:50:24 2017 +0200
@@ -125,3 +125,4 @@
 f42e3d9394b40a423d345b8da22687b5462e5f25 jdk8-b01
 69f592185747226a9c765a9fe139c1d34d616f9c jdk8-b02
 587bb549dff83131b65f40aa51864f69562f34a7 jdk8-b03
+0b66a233bfb9ba2ebda1e5cdfdb0373d6c1e3c69 jdk8-b04
--- a/corba/.hgtags	Wed Jul 05 17:50:00 2017 +0200
+++ b/corba/.hgtags	Wed Jul 05 17:50:24 2017 +0200
@@ -125,3 +125,4 @@
 949fb60ca830364571e7c4c9964e6b351ca929ec jdk8-b01
 ed8d94519a87b4adac270c3eec9134ff1f62bff5 jdk8-b02
 cd0da00694fbce642db9be936d3e4909a71d911d jdk8-b03
+60a68d688e24473cf84dedd1e60901a61ab82555 jdk8-b04
--- a/hotspot/.hgtags	Wed Jul 05 17:50:00 2017 +0200
+++ b/hotspot/.hgtags	Wed Jul 05 17:50:24 2017 +0200
@@ -177,3 +177,4 @@
 0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01
 31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02
 3a2fb61165dfc72e398179a2796d740c8da5b8c0 jdk8-b03
+0fa3ace511fe98fe948e751531f3e2b7c60c8376 jdk8-b04
--- a/jaxp/.hgtags	Wed Jul 05 17:50:00 2017 +0200
+++ b/jaxp/.hgtags	Wed Jul 05 17:50:24 2017 +0200
@@ -125,3 +125,4 @@
 4f0fcb812767594fe9de509f946b56942db5a2f0 jdk8-b01
 ca4d6ad55a660f0469882e85b4dacf7822d50abf jdk8-b02
 7a74371ce0c64108b857c497ae130dfe9514532c jdk8-b03
+acbcadef0b21582abf406f07f1b74d2b8f80dc01 jdk8-b04
--- a/jaxws/.hgtags	Wed Jul 05 17:50:00 2017 +0200
+++ b/jaxws/.hgtags	Wed Jul 05 17:50:24 2017 +0200
@@ -125,3 +125,4 @@
 64df57a1edeca74388bd62f0a87d056db981fbdf jdk8-b01
 1034127ed402e9d0f1ed1477238ef594e9cc8da6 jdk8-b02
 7dcb0307508f408507d878cd7c2048c102b15158 jdk8-b03
+3f6f08163331ed75b30a6de1246670ce655645c8 jdk8-b04
--- a/jdk/.hgtags	Wed Jul 05 17:50:00 2017 +0200
+++ b/jdk/.hgtags	Wed Jul 05 17:50:24 2017 +0200
@@ -125,3 +125,4 @@
 2cdbbc4a63592be7f1556fffe37b1253a77bd481 jdk8-b01
 13e70aa1398eb959c54bc68b783ca0eef1286ad2 jdk8-b02
 7989ee9fe673a87f4db3917fa6a005732a6a9b85 jdk8-b03
+fc569517f3cf242f90ce3503b743eb5553938946 jdk8-b04
--- a/jdk/src/share/classes/java/lang/VirtualMachineError.java	Wed Jul 05 17:50:00 2017 +0200
+++ b/jdk/src/share/classes/java/lang/VirtualMachineError.java	Wed Jul 05 17:50:24 2017 +0200
@@ -3,7 +3,7 @@
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, asP
+ * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this
  * particular file as subject to the "Classpath" exception as provided
  * by Oracle in the LICENSE file that accompanied this code.
--- a/langtools/.hgtags	Wed Jul 05 17:50:00 2017 +0200
+++ b/langtools/.hgtags	Wed Jul 05 17:50:24 2017 +0200
@@ -125,3 +125,4 @@
 e9f118c2bd3c4690d8d2e6b108b5bad7e226634c jdk8-b01
 b3c059de2a61fc122c99d555cdd8b85f112393c1 jdk8-b02
 f497fac86cf9ada4801ecaf49eb0d2307a2b61c8 jdk8-b03
+5df63fd8fa64741e829281ee6febe9954932841b jdk8-b04
jdk-sandbox