From c22fc374b6f63cb5b1fd7bd2036ff47df95f7691 Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <jeffrey.mitchell@gmail.com>
Date: Mon, 21 Mar 2016 16:56:13 -0400
Subject: [PATCH] Merge HA Backend objects

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

diff --git a/command/server/config.go b/command/server/config.go
index 20e4434b37..450f640f8b 100644
--- a/command/server/config.go
+++ b/command/server/config.go
@@ -110,6 +110,11 @@ func (c *Config) Merge(c2 *Config) *Config {
 		result.Backend = c2.Backend
 	}
 
+	result.HABackend = c.HABackend
+	if c2.HABackend != nil {
+		result.HABackend = c2.HABackend
+	}
+
 	result.Telemetry = c.Telemetry
 	if c2.Telemetry != nil {
 		result.Telemetry = c2.Telemetry