github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

agent: Allow CheckUpdateInterval to be zero

pull/204/head
Armon Dadgar 2014-06-09 12:46:10 -07:00
parent 971d093283
commit 1b53664879
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command/agent/config.go
View File

@ -553,7 +553,7 @@ func MergeConfig(a, b *Config) *Config {
if b.DNSConfig.MaxStale != 0 { if b.DNSConfig.MaxStale != 0 {
result.DNSConfig.MaxStale = b.DNSConfig.MaxStale result.DNSConfig.MaxStale = b.DNSConfig.MaxStale
} }
if b.CheckUpdateInterval != 0 { if b.CheckUpdateIntervalRaw != "" {
result.CheckUpdateInterval = b.CheckUpdateInterval result.CheckUpdateInterval = b.CheckUpdateInterval
} }