Merge

375ec52d · tonyp · 62c15ec5 · 15213909 · 375ec52d · 375ec52d
9 changed file
--- a/.hgtags
+++ b/.hgtags
@@ -131,3 +131,4 @@ c4f9ea1ecb55ff44e0dd21d2888ead308c86a3aa jdk8-b05
 bc5710332b294676661103bb20d47d2ea3ba8def jdk8-b07
 24ee504f80412770c6874836cd9e55b536427b1d jdk8-b08
 fbf3cabc9e3bb1fcf710941d777cb0400505fbe6 jdk8-b09
+f651ce87127980c58e3599daba964eba2f3b4026 jdk8-b10
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -131,3 +131,4 @@ b910aac18c772b823b1f7da03e2c6528725cc6de jdk8-b05
 0db7ae9f2b1017124c779bccd016c976928859a0 jdk8-b07
 fb1bc13260d76447e269e843859eb593fe2a8ab2 jdk8-b08
 8adb70647b5af5273dfe6a540f07be667cd50216 jdk8-b09
+a6c4c248e8fa350c35014fa94bab5ac1a1ac3299 jdk8-b10
--- a/corba/.hgtags
+++ b/corba/.hgtags
@@ -131,3 +131,4 @@ cc1b599b986a37cb57de4584c5e58169766ca535 jdk8-b05
 3d61f0856f349e2163bf98146465dab3b7437f63 jdk8-b07
 0d52b1c87aa8fdea7fdc9c4126ea58f95ca6b351 jdk8-b08
 a891732c1a83082177ff7a4cf1506068d9cc0a47 jdk8-b09
+cda87f7fefcee3b89742a57ce5ad9b03a54c210d jdk8-b10
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -191,3 +191,5 @@ da883b9e6d3788057f9577e72712998ed82c9b7e hs23-b01
 49ed7eacfd16616166ff066493143889741097af jdk8-b08
 7c20d272643f47195478708eff593a9cce40fec4 jdk8-b09
 e4f412d2b75d2c797acff965aa2c420e3d358f09 hs23-b02
+d815de2e85e511b7deab2a83cf80c0224d011da9 jdk8-b10
+4d3850d9d326ac3a9bee2d867727e954322d014e hs23-b03
--- a/hotspot/make/hotspot_version
+++ b/hotspot/make/hotspot_version
@@ -35,7 +35,7 @@ HOTSPOT_VM_COPYRIGHT=Copyright 2011

 HS_MAJOR_VER=23
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=03
+HS_BUILD_NUMBER=04

 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8

--- a/jaxp/.hgtags
+++ b/jaxp/.hgtags
@@ -131,3 +131,4 @@ d7b8192e7277c49b9c702f4c4fd99bd83ba947ea jdk8-b06
 c114306576dcc1cb871a48058b41bf7d87ce882a jdk8-b07
 de4794dd69c48b08029d158a972993ff9d5627df jdk8-b08
 93554324c014282571aeeb48552ad00d3fedb089 jdk8-b09
+d21a4d5141c04bc9e88f2c0253121d449b66d667 jdk8-b10
--- a/jaxws/.hgtags
+++ b/jaxws/.hgtags
@@ -131,3 +131,4 @@ acffff22a9465005e8eb206224fae9f2ea4fd469 jdk8-b06
 134b0debf7b04fe6e317394b04b8e7a4a0181b1b jdk8-b07
 1c9d4f59acf8f71477473c170239b43b2c9dee24 jdk8-b08
 70172e57cf29efe271b068987eefb601c2a77780 jdk8-b09
+8e7fdc8e3c758644ca6d0fd70bb255e9d2e64cda jdk8-b10
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -131,3 +131,4 @@ bdb870cc269ef8b221d17a217be89092400b59d2 jdk8-b06
 19f0a3db863cc491affc78b48c4a81a6679b2433 jdk8-b07
 1c023bcd0c5a01ac07bc7eea728aafbb0d8991e9 jdk8-b08
 f1ec21b8142168ff40f3278d2f6b5fe4bd5f3b26 jdk8-b09
+4788745572ef2bde34924ef34e7e4d55ba07e979 jdk8-b10
--- a/langtools/.hgtags
+++ b/langtools/.hgtags
@@ -131,3 +131,4 @@ d2422276f9dabc848b7a079025719826d2f9a30f jdk8-b06
 116980ecec5cc7d52736f09cf332321e0773265f jdk8-b07
 e8acc2d6c32f0c8321e642e1a86672a2e196a056 jdk8-b08
 b7a7e47c8d3daf7822abf7c37e5179ccbbf53008 jdk8-b09
+f6c783e18bdf4d46a0ab273868afebbf32600ff7 jdk8-b10