Mercurial > hg > graal-jvmci-8

changeset 23939:db71151912ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Wed, 15 Jun 2016 13:48:09 -0700
parents 09fbe9c45409 (current diff) bd1243bce4f5 (diff)
children b5f2f874db7c
files .hgtags
diffstat 2 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed May 11 12:03:46 2016 -0400
+++ b/.hgtags	Wed Jun 15 13:48:09 2016 -0700
@@ -839,6 +839,7 @@
 bbbb05e91c629f8d9eef2ba43933767f68a898b0 jdk8u91-b00
 e36b6ade0499eadfd8673fe62ef0a613af2e6d67 jdk8u91-b13
 fa8991ccf6e5b74890a0b5672440b3c09d8d8732 jdk8u91-b14
+e1ea97ad19af4d1e0bda449aa43be7e1b118ffe9 jdk8u91-b15
 1b6d4fd2730e58f17820930f797938dc182117c4 jdk8u77-b00
 ddd297e340b1170d3cec011ee64e729f8b493c86 jdk8u77-b01
 1b4072e4bb3ad54c4e894998486a8b33f0689160 jdk8u77-b02
@@ -869,6 +870,10 @@
 7c60503b0888ac16eac80a6cd074195973f8dedb jdk8u101-b06
 cb4af293fe70549b51039bb9197f373e6750fafb jdk8u101-b07
 8ed377d2cec94435d1617a37999960a24be73ad9 jdk8u101-b08
+9be452c4e7161e60d623d55bb72ad013386aefd1 jdk8u101-b09
+218a44a163fa8c2532fd5f2e8ea9bc3c9c2ca8cf jdk8u101-b10
+0095e54dcaa1acfe1614feff9600734c26af7ae8 jdk8u101-b11
+286fe17d81c3d153611a28e50926083ae934cc56 jdk8u101-b12
 d6c92b9e192ef97305a699e868387d55821c81ad jdk8u102-b00
 d6c92b9e192ef97305a699e868387d55821c81ad jdk8u82-b00
 516a64e6d7c2dc29fd932bf3b8313e560a01bcd0 jdk8u102-b01
@@ -879,4 +884,8 @@
 12cd1f9b403eb5024e8642bfa59136cd275899a4 jdk8u102-b06
 9ff5455815c1864ef7ca2d5232decd2023d1d043 jdk8u102-b07
 69f5f6c2beeb3bb126494ed779ae1686f61602b9 jdk8u102-b08
+b5ecd8067e899c4bfb8d327ee7583a32129772d4 jdk8u102-b09
+2672cfc2d7b6ffa07b7714208f9d46a405211d94 jdk8u102-b10
+36a1a2875ed55fa17818f3eb203e27922a7b4589 jdk8u102-b11
+340e1a736ef7169786e70db7f31ffd32bc3be24d jdk8u102-b12
 ceecf88e5c2c09bfabf5926581e6d0b0f65f5148 jdk8u111-b00
--- a/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp	Wed May 11 12:03:46 2016 -0400
+++ b/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp	Wed Jun 15 13:48:09 2016 -0700
@@ -168,7 +168,7 @@
 
   if (TraceDynamicGCThreads) {
      gclog_or_tty->print_cr("GCTaskManager::calc_default_active_workers() : "
-       "active_workers(): %d  new_acitve_workers: %d  "
+       "active_workers(): %d  new_active_workers: %d  "
        "prev_active_workers: %d\n"
        " active_workers_by_JT: %d  active_workers_by_heap_size: %d",
        (int) active_workers, (int) new_active_workers, (int) prev_active_workers,