Sat, 21 Jun 2014 01:56:29 +0000
Merge
1.1 --- a/.hgtags Fri Jun 20 10:48:36 2014 -0400 1.2 +++ b/.hgtags Sat Jun 21 01:56:29 2014 +0000 1.3 @@ -474,3 +474,5 @@ 1.4 b685b4e870b159ea5731984199d275879d427038 hs25.20-b18 1.5 11159d7ec80462a422e39c9b3a39ae932923622d jdk8u20-b18 1.6 3e1cec358ab95ef985f821219104141b9ffda83f hs25.20-b19 1.7 +b15553cde967dfd7781a4a5c669e4cb7db734317 jdk8u20-b19 1.8 +4f18dea0312d601d0515976bc0c643ea7acc829d hs25.20-b20
2.1 --- a/make/hotspot_version Fri Jun 20 10:48:36 2014 -0400 2.2 +++ b/make/hotspot_version Sat Jun 21 01:56:29 2014 +0000 2.3 @@ -35,7 +35,7 @@ 2.4 2.5 HS_MAJOR_VER=25 2.6 HS_MINOR_VER=20 2.7 -HS_BUILD_NUMBER=20 2.8 +HS_BUILD_NUMBER=21 2.9 2.10 JDK_MAJOR_VER=1 2.11 JDK_MINOR_VER=8