changeset 5097:0c79cc0b79fd

Merge
author acorn
date Thu, 01 Apr 2010 20:48:50 -0400
parents c05a19f139d5 f6fbf7638a0d
children e3ec1029407a
files
diffstat 9 files changed, 13 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Apr 01 11:23:01 2010 -0400
+++ b/.hgtags	Thu Apr 01 20:48:50 2010 -0400
@@ -60,3 +60,4 @@
 34c8199936a1682aa8587857f44cfaf37c2b6381 jdk7-b83
 b1e55627a6980b9508854ed0c0f21d4f981b4494 jdk7-b84
 b6f633a93ae0ec4555ff4bf756f5e2150c9bdede jdk7-b85
+c94d9cc81f495d97817eba9d71b84fc45f7661a5 jdk7-b86
--- a/.hgtags-top-repo	Thu Apr 01 11:23:01 2010 -0400
+++ b/.hgtags-top-repo	Thu Apr 01 20:48:50 2010 -0400
@@ -60,3 +60,4 @@
 6880a3af9addb41541e80ebe8cde6f79ec402a58 jdk7-b83
 2f3ea057d1ad56cf3b269cdc4de2741411151982 jdk7-b84
 cf26288a114be67c39f2758959ce50b60f5ae330 jdk7-b85
+433a60a9c0bf1b26ee7e65cebaa89c541f497aed jdk7-b86
--- a/corba/.hgtags	Thu Apr 01 11:23:01 2010 -0400
+++ b/corba/.hgtags	Thu Apr 01 20:48:50 2010 -0400
@@ -60,3 +60,4 @@
 fde0df7a2384f7fe33204a79678989807d9c2b98 jdk7-b83
 68c8961a82e4a3ad2a67991e5d834192a81eb4cd jdk7-b84
 c67a9df7bc0ca291f08f9a9cc05cb78ea15d25e6 jdk7-b85
+6253e28826d16cf1aecc39ce04c8de1f6bf2df5f jdk7-b86
--- a/hotspot/.hgtags	Thu Apr 01 11:23:01 2010 -0400
+++ b/hotspot/.hgtags	Thu Apr 01 20:48:50 2010 -0400
@@ -83,3 +83,6 @@
 ffc8d176b84bcfb5ac21302b4feb3b0c0d69b97c jdk7-b84
 6c9796468b91dcbb39e09dfa1baf9779ac45eb66 jdk7-b85
 418bc80ce13995149eadc9eecbba21d7a9fa02ae hs17-b10
+bf823ef06b4f211e66988d76a2e2669be5c0820e jdk7-b86
+07226e9eab8f74b37346b32715f829a2ef2c3188 hs18-b01
+e7e7e36ccdb5d56edd47e5744351202d38f3b7ad jdk7-b87
--- a/hotspot/make/hotspot_version	Thu Apr 01 11:23:01 2010 -0400
+++ b/hotspot/make/hotspot_version	Thu Apr 01 20:48:50 2010 -0400
@@ -31,11 +31,11 @@
 #
 
 # Don't put quotes (fail windows build).
-HOTSPOT_VM_COPYRIGHT=Copyright 2009
+HOTSPOT_VM_COPYRIGHT=Copyright 2010
 
-HS_MAJOR_VER=17
+HS_MAJOR_VER=18
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=10
+HS_BUILD_NUMBER=02
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7
--- a/jaxp/.hgtags	Thu Apr 01 11:23:01 2010 -0400
+++ b/jaxp/.hgtags	Thu Apr 01 20:48:50 2010 -0400
@@ -60,3 +60,4 @@
 309a0a7fc6ceb1c9fc3a85b3608e97ef8f7b0dfd jdk7-b83
 32c0cf01d555747918529a6ff9e06b0090c7a474 jdk7-b84
 6c0ccabb430dacdcd4479f8b197980d5da4eeb66 jdk7-b85
+81c0f115bbe5d3bcf59864465b5eca5538567c79 jdk7-b86
--- a/jaxws/.hgtags	Thu Apr 01 11:23:01 2010 -0400
+++ b/jaxws/.hgtags	Thu Apr 01 20:48:50 2010 -0400
@@ -60,3 +60,4 @@
 371e3ded591d09112a9f231e37cb072781c486ac jdk7-b83
 8bc02839eee4ef02cd1b50e87638874368a26535 jdk7-b84
 8424512588ff95362c1f1e5f11c6efd4e7f7db6e jdk7-b85
+512b0e924a5ae0c0b7ad326182cae0dc0e4d1aa8 jdk7-b86
--- a/jdk/.hgtags	Thu Apr 01 11:23:01 2010 -0400
+++ b/jdk/.hgtags	Thu Apr 01 20:48:50 2010 -0400
@@ -60,3 +60,4 @@
 9027c6b9d7e2c9ca04a1add691b5b50d0f22b1aa jdk7-b83
 7cb9388bb1a16365fa5118c5efa38b1cd58be40d jdk7-b84
 b396584a3e64988839cca21ea1f7fbdcc9248783 jdk7-b85
+eae6e9ab26064d9ba0e7665dd646a1fd2506fcc1 jdk7-b86
--- a/langtools/.hgtags	Thu Apr 01 11:23:01 2010 -0400
+++ b/langtools/.hgtags	Thu Apr 01 20:48:50 2010 -0400
@@ -60,3 +60,4 @@
 c9f4ae1f1480e89aaf7e72173184089d9cea397a jdk7-b83
 d9cd5b8286e44f3baf90da290cd295433e21c05a jdk7-b84
 136bfc67946219fb02ee223984540a4a9c5b209f jdk7-b85
+ef07347428f2198ae6b8144ac0b9086bbe39fd16 jdk7-b86