From 1ebc1cf9164cea924969b1a4987684f353ada327 Mon Sep 17 00:00:00 2001 From: artushin Date: Thu, 23 Apr 2015 16:56:20 -0500 Subject: [PATCH] add CheckUpdateStagger to MergeConfig --- command/agent/config.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/command/agent/config.go b/command/agent/config.go index 7b6fc1ba6..581cf9ca4 100644 --- a/command/agent/config.go +++ b/command/agent/config.go @@ -930,6 +930,9 @@ func MergeConfig(a, b *Config) *Config { if b.CheckUpdateIntervalRaw != "" || b.CheckUpdateInterval != 0 { result.CheckUpdateInterval = b.CheckUpdateInterval } + if b.CheckUpdateStagger { + result.CheckUpdateStagger = true + } if b.SyslogFacility != "" { result.SyslogFacility = b.SyslogFacility }