luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

agent: Fixing merge of CheckUpdateInterval

This commit is contained in:
Armon Dadgar 2014-06-09 21:34:19 -07:00
parent cae158b310
commit 4909c74175
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 {
result.DNSConfig.MaxStale = b.DNSConfig.MaxStale
}
if b.CheckUpdateIntervalRaw != "" {
if b.CheckUpdateIntervalRaw != "" || b.CheckUpdateInterval != 0 {
result.CheckUpdateInterval = b.CheckUpdateInterval
}