From c9cca6a93b2232aa867fc11e5b61875ec0c49dfa Mon Sep 17 00:00:00 2001
From: Yicheng Qin <qycqycqycqycqyc@gmail.com>
Date: Thu, 13 Aug 2015 11:41:19 -0700
Subject: [PATCH] *: update MinClusterVersion and supportedStream map

---
 rafthttp/http_test.go | 3 +++
 rafthttp/stream.go    | 1 +
 version/version.go    | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/rafthttp/http_test.go b/rafthttp/http_test.go
index d11a08822..a3aedbabc 100644
--- a/rafthttp/http_test.go
+++ b/rafthttp/http_test.go
@@ -147,6 +147,7 @@ func TestServeRaftPrefix(t *testing.T) {
 			t.Fatalf("#%d: could not create request: %#v", i, err)
 		}
 		req.Header.Set("X-Etcd-Cluster-ID", tt.clusterID)
+		req.Header.Set("X-Server-Version", version.Version)
 		rw := httptest.NewRecorder()
 		h := NewHandler(tt.p, types.ID(0))
 		h.ServeHTTP(rw, req)
@@ -181,6 +182,7 @@ func TestServeRaftStreamPrefix(t *testing.T) {
 			t.Fatalf("#%d: could not create request: %#v", i, err)
 		}
 		req.Header.Set("X-Etcd-Cluster-ID", "1")
+		req.Header.Set("X-Server-Version", version.Version)
 		req.Header.Set("X-Raft-To", "2")
 		wterm := "1"
 		req.Header.Set("X-Raft-Term", wterm)
@@ -300,6 +302,7 @@ func TestServeRaftStreamPrefixBad(t *testing.T) {
 			t.Fatalf("#%d: could not create request: %#v", i, err)
 		}
 		req.Header.Set("X-Etcd-Cluster-ID", tt.clusterID)
+		req.Header.Set("X-Server-Version", version.Version)
 		req.Header.Set("X-Raft-To", tt.remote)
 		rw := httptest.NewRecorder()
 		peerGetter := &fakePeerGetter{peers: map[types.ID]Peer{types.ID(1): newFakePeer()}}
diff --git a/rafthttp/stream.go b/rafthttp/stream.go
index 9f979f358..20d3597f7 100644
--- a/rafthttp/stream.go
+++ b/rafthttp/stream.go
@@ -48,6 +48,7 @@ var (
 	supportedStream = map[string][]streamType{
 		"2.0.0": []streamType{streamTypeMsgApp},
 		"2.1.0": []streamType{streamTypeMsgApp, streamTypeMsgAppV2, streamTypeMessage},
+		"2.2.0": []streamType{streamTypeMsgApp, streamTypeMsgAppV2, streamTypeMessage},
 	}
 )
 
diff --git a/version/version.go b/version/version.go
index a129eae52..81641aee7 100644
--- a/version/version.go
+++ b/version/version.go
@@ -24,7 +24,7 @@ import (
 
 var (
 	// MinClusterVersion is the min cluster version this etcd binary is compatible with.
-	MinClusterVersion = "2.0.0"
+	MinClusterVersion = "2.1.0"
 	Version           = "2.2.0-alpha.0+git"
 
 	// Git SHA Value will be set during build