Merge
authorjwilhelm
Sat, 12 Oct 2013 05:08:42 +0000
changeset 20720 b03e2f7796a7
parent 20671 9c5dc973fe8c (current diff)
parent 20719 ffa4f0de0dad (diff)
child 20721 b134465e8682
Merge
hotspot/src/share/vm/runtime/globals.hpp
--- a/hotspot/src/share/vm/runtime/globals.hpp	Fri Oct 11 13:14:48 2013 -0700
+++ b/hotspot/src/share/vm/runtime/globals.hpp	Sat Oct 12 05:08:42 2013 +0000
@@ -3125,10 +3125,14 @@
           "class pointers are used")                                        \
                                                                             \
   product(uintx, MinHeapFreeRatio,    40,                                   \
-          "The minimum percentage of heap free after GC to avoid expansion")\
+          "The minimum percentage of heap free after GC to avoid expansion."\
+          " For most GCs this applies to the old generation. In G1 it"      \
+          " applies to the whole heap. Not supported by ParallelGC.")       \
                                                                             \
   product(uintx, MaxHeapFreeRatio,    70,                                   \
-          "The maximum percentage of heap free after GC to avoid shrinking")\
+          "The maximum percentage of heap free after GC to avoid shrinking."\
+          " For most GCs this applies to the old generation. In G1 it"      \
+          " applies to the whole heap. Not supported by ParallelGC.")       \
                                                                             \
   product(intx, SoftRefLRUPolicyMSPerMB, 1000,                              \
           "Number of milliseconds per MB of free space in the heap")        \