# HG changeset patch
# User asaha
# Date 1414195770 25200
# Node ID 12478c5eb00042e4316d4b0e1cc757d70a885de4
# Parent  37179dcf830ad4cb2b84a53f0d800a8c085c2bd9# Parent  c2844108a7085f7ed4a7450da08d0b7865e44dab
Merge

diff -r c2844108a708 -r 12478c5eb000 .hgtags
--- a/.hgtags	Thu Oct 23 12:02:08 2014 -0700
+++ b/.hgtags	Fri Oct 24 17:09:30 2014 -0700
@@ -556,3 +556,4 @@
 1b3abbeee961dee49780c0e4af5337feb918c555 jdk8u40-b10
 f10fe402dfb1543723b4b117a7cba3ea3d4159f1 hs25.40-b15
 99372b2fee0eb8b3452f47230e84aa6e97003184 jdk8u40-b11
+b95f13f05f553309cd74d6ccf8fcedb259c6716c jdk8u45-b00
diff -r c2844108a708 -r 12478c5eb000 make/hotspot_version
--- a/make/hotspot_version	Thu Oct 23 12:02:08 2014 -0700
+++ b/make/hotspot_version	Fri Oct 24 17:09:30 2014 -0700
@@ -34,8 +34,8 @@
 HOTSPOT_VM_COPYRIGHT=Copyright 2015
 
 HS_MAJOR_VER=25
-HS_MINOR_VER=40
-HS_BUILD_NUMBER=15
+HS_MINOR_VER=45
+HS_BUILD_NUMBER=01
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8
diff -r c2844108a708 -r 12478c5eb000 src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Thu Oct 23 12:02:08 2014 -0700
+++ b/src/share/vm/runtime/arguments.cpp	Fri Oct 24 17:09:30 2014 -0700
@@ -2283,7 +2283,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");