Mercurial > hg > arm32-8u40

changeset 7115:37179dcf830a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Mon, 20 Oct 2014 23:02:07 -0700
parents 5f07d936a14e (diff) e620c670a9a7 (current diff)
children 60a992c821f8 12478c5eb000
files .hgtags make/hotspot_version
diffstat 3 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Oct 20 14:31:52 2014 -0700
+++ b/.hgtags	Mon Oct 20 23:02:07 2014 -0700
@@ -529,3 +529,4 @@
 401cbaa475b4efe53153119ab87a82b217980a7f jdk8u31-b03
 060cdf93040c1bfa5fdf580da5e9999042632cc8 jdk8u31-b04
 6e56d7f1634f6c4cd4196e699c06e6ca2e6d6efb jdk8u31-b05
+b95f13f05f553309cd74d6ccf8fcedb259c6716c jdk8u45-b00
--- a/make/hotspot_version	Mon Oct 20 14:31:52 2014 -0700
+++ b/make/hotspot_version	Mon Oct 20 23:02:07 2014 -0700
@@ -34,8 +34,8 @@
 HOTSPOT_VM_COPYRIGHT=Copyright 2015
 
 HS_MAJOR_VER=25
-HS_MINOR_VER=31
-HS_BUILD_NUMBER=02
+HS_MINOR_VER=45
+HS_BUILD_NUMBER=01
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8
--- a/src/share/vm/runtime/arguments.cpp	Mon Oct 20 14:31:52 2014 -0700
+++ b/src/share/vm/runtime/arguments.cpp	Mon Oct 20 23:02:07 2014 -0700
@@ -2216,7 +2216,7 @@
                                         "G1ConcMarkStepDurationMillis");
     status = status && verify_interval(G1ConcRSHotCardLimit, 0, max_jubyte,
                                        "G1ConcRSHotCardLimit");
-    status = status && verify_interval(G1ConcRSLogCacheSize, 0, 31,
+    status = status && verify_interval(G1ConcRSLogCacheSize, 0, 27,
                                        "G1ConcRSLogCacheSize");
     status = status && verify_interval(StringDeduplicationAgeThreshold, 1, markOopDesc::max_age,
                                        "StringDeduplicationAgeThreshold");