From d43af22b2b449b74dd15c4d6ed41734baa2be33b Mon Sep 17 00:00:00 2001
From: Diptanu Choudhury <diptanuc@gmail.com>
Date: Fri, 12 Feb 2016 09:40:28 -0800
Subject: [PATCH] Merging the value of http advertise addr if user is providing
 one

---
 command/agent/config.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/command/agent/config.go b/command/agent/config.go
index 89abd6300..2a5f55715 100644
--- a/command/agent/config.go
+++ b/command/agent/config.go
@@ -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
 }