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

add CheckUpdateStagger to MergeConfig

pull/884/head
artushin 2015-04-23 16:56:20 -05:00
parent 8decf5d394
commit fc0331ddfc
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
command/agent/config.go
View File

@ -930,6 +930,9 @@ func MergeConfig(a, b *Config) *Config {
if b.CheckUpdateIntervalRaw != "" || b.CheckUpdateInterval != 0 {
result.CheckUpdateInterval = b.CheckUpdateInterval
}
if b.CheckUpdateStagger {
result.CheckUpdateStagger = true
}
if b.SyslogFacility != "" {
result.SyslogFacility = b.SyslogFacility
}