From f476166fe40a4beb240d4e76591728d1f35f5daa Mon Sep 17 00:00:00 2001
From: Ryan Uber <ru@ryanuber.com>
Date: Sun, 12 Oct 2014 10:54:53 -0700
Subject: [PATCH] agent: merge RetryInterval in config merger

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

diff --git a/command/agent/config.go b/command/agent/config.go
index 419fa9091..d253dabcd 100644
--- a/command/agent/config.go
+++ b/command/agent/config.go
@@ -700,6 +700,9 @@ func MergeConfig(a, b *Config) *Config {
 	if b.RetryMaxAttempts != 0 {
 		result.RetryMaxAttempts = b.RetryMaxAttempts
 	}
+	if b.RetryInterval != 0 {
+		result.RetryInterval = b.RetryInterval
+	}
 	if b.DNSConfig.NodeTTL != 0 {
 		result.DNSConfig.NodeTTL = b.DNSConfig.NodeTTL
 	}