From 46b94d8612a645deb2facfad1dd12f8fc3681e40 Mon Sep 17 00:00:00 2001
From: vishalnayak <vishalnayakv@gmail.com>
Date: Tue, 26 Jul 2016 11:11:12 -0400
Subject: [PATCH] Update cluster name during config merge

---
 command/server/config.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/command/server/config.go b/command/server/config.go
index d58a11fe10..571d4fc59d 100644
--- a/command/server/config.go
+++ b/command/server/config.go
@@ -212,6 +212,11 @@ func (c *Config) Merge(c2 *Config) *Config {
 		result.DefaultLeaseTTL = c2.DefaultLeaseTTL
 	}
 
+	result.ClusterName = c.ClusterName
+	if c2.ClusterName != "" {
+		result.ClusterName = c2.ClusterName
+	}
+
 	return result
 }