From 4909c74175bd805cc6afe9bee2e0065537f85bfd Mon Sep 17 00:00:00 2001 From: Armon Dadgar Date: Mon, 9 Jun 2014 21:34:19 -0700 Subject: [PATCH] agent: Fixing merge of CheckUpdateInterval --- command/agent/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/command/agent/config.go b/command/agent/config.go index 0abd04fa2..f009e1e2d 100644 --- a/command/agent/config.go +++ b/command/agent/config.go @@ -553,7 +553,7 @@ func MergeConfig(a, b *Config) *Config { if b.DNSConfig.MaxStale != 0 { result.DNSConfig.MaxStale = b.DNSConfig.MaxStale } - if b.CheckUpdateIntervalRaw != "" { + if b.CheckUpdateIntervalRaw != "" || b.CheckUpdateInterval != 0 { result.CheckUpdateInterval = b.CheckUpdateInterval }