agent: Fixing merge of CheckUpdateInterval

11 years ago · 87373787e2
parent 476339b20c
commit 87373787e2
1 changed files with 1 additions and 1 deletions
--- 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
 	}