Merging the value of http advertise addr if user is providing one

This commit is contained in:
Diptanu Choudhury
2016-02-12 09:40:28 -08:00
parent e8d3da2b2f
commit d43af22b2b

View File

@@ -602,6 +602,9 @@ func (a *AdvertiseAddrs) Merge(b *AdvertiseAddrs) *AdvertiseAddrs {
if b.Serf != "" {
result.Serf = b.Serf
}
if b.HTTP != "" {
result.HTTP = b.HTTP
}
return &result
}