Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3286 from yichengq/fit-2.2

Browse Source 
*: update MinClusterVersion and supportedStream map
This commit is contained in:
Yicheng Qin 2015-08-13 13:31:37 -07:00
commit 003d096138
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rafthttp/http_test.go
View File

@ -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()}}

1
rafthttp/stream.go
View File

@ -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},
}
)

2
version/version.go
View File

@ -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