# HG changeset patch
# User KUBOTA Yuji <kubota.yuji@lab.ntt.co.jp>
# Date 1489114698 -32400
# Node ID 24fe0024d3e2175f4126550e72a3b076927d6eca
# Parent  5c6af4ec5c406d4fe3a3069956ee63ab24f9ed8b
Bug 3339: [BACKOUT] Bug 3338 for HeapStats 1.0
Reviewed-by: yasuenag

diff -r 5c6af4ec5c40 -r 24fe0024d3e2 agent/ChangeLog
--- a/agent/ChangeLog	Fri Mar 10 09:31:39 2017 +0900
+++ b/agent/ChangeLog	Fri Mar 10 11:58:18 2017 +0900
@@ -2,6 +2,7 @@
 
 	* Bug 3223: Cannot set empty value to signal setting
 	* Bug 3338: Make reloadable option as same as the latest version
+	* Bug 3339: [BACKOUT] Bug 3338 for HeapStats 1.0
 
 2017-01-16 Yasumasa Suenaga  <yasuenag@gmail.com>
 
diff -r 5c6af4ec5c40 -r 24fe0024d3e2 agent/src/util.cpp
--- a/agent/src/util.cpp	Fri Mar 10 09:31:39 2017 +0900
+++ b/agent/src/util.cpp	Fri Mar 10 11:58:18 2017 +0900
@@ -221,6 +221,8 @@
   newArg->triggerOnLogError &= oldArg->triggerOnLogError;
   newArg->triggerOnLogSignal = oldArg->triggerOnLogSignal;
   newArg->triggerOnLogLock   = oldArg->triggerOnLogLock;
+  newArg->TimerInterval      = oldArg->TimerInterval;
+  newArg->LogInterval        = oldArg->LogInterval;
   newArg->logSignalNormal    = oldArg->logSignalNormal;
   newArg->logSignalAll       = oldArg->logSignalAll;
   newArg->reloadSignal       = oldArg->reloadSignal;