mirror of https://github.com/hashicorp/consul
agent: Allow CheckUpdateInterval to be zero
parent
971d093283
commit
1b53664879
|
@ -553,7 +553,7 @@ func MergeConfig(a, b *Config) *Config {
|
|||
if b.DNSConfig.MaxStale != 0 {
|
||||
result.DNSConfig.MaxStale = b.DNSConfig.MaxStale
|
||||
}
|
||||
if b.CheckUpdateInterval != 0 {
|
||||
if b.CheckUpdateIntervalRaw != "" {
|
||||
result.CheckUpdateInterval = b.CheckUpdateInterval
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue