From 6e0140c6ffb8fa6becd014d256899019255f96fb Mon Sep 17 00:00:00 2001
From: Armon Dadgar <armon.dadgar@gmail.com>
Date: Thu, 4 Jun 2015 13:15:46 +0200
Subject: [PATCH] nomad: adding merge guard for non-nomad servers

---
 nomad/merge.go | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/nomad/merge.go b/nomad/merge.go
index b3070e9ce..7b6288cc0 100644
--- a/nomad/merge.go
+++ b/nomad/merge.go
@@ -1,6 +1,10 @@
 package nomad
 
-import "github.com/hashicorp/serf/serf"
+import (
+	"fmt"
+
+	"github.com/hashicorp/serf/serf"
+)
 
 // serfMergeDelegate is used to handle a cluster merge on the gossip
 // ring. We check that the peers are nomad servers and abort the merge
@@ -9,11 +13,11 @@ type serfMergeDelegate struct {
 }
 
 func (md *serfMergeDelegate) NotifyMerge(members []*serf.Member) error {
-	//for _, m := range members {
-	//ok, _ := isConsulServer(*m)
-	//if !ok {
-	//    return fmt.Errorf("Member '%s' is not a server", m.Name)
-	//}
-	//}
+	for _, m := range members {
+		ok, _ := isNomadServer(*m)
+		if !ok {
+			return fmt.Errorf("member '%s' is not a server", m.Name)
+		}
+	}
 	return nil
 }