From b82c171f5fb0de3bd9f2609f716461418b3079af Mon Sep 17 00:00:00 2001 From: Yicheng Qin Date: Wed, 4 Nov 2015 14:30:04 -0800 Subject: [PATCH 1/2] version: update MinClusterVersion to v2.2.0 This is the preparation for bumping to v2.3.0-alpha --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index f3859b6c2..373edb0ad 100644 --- a/version/version.go +++ b/version/version.go @@ -26,7 +26,7 @@ import ( var ( // MinClusterVersion is the min cluster version this etcd binary is compatible with. - MinClusterVersion = "2.1.0" + MinClusterVersion = "2.2.0" Version = "2.2.0+git" // Git SHA Value will be set during build From ec3c2d23a36776cce80e9b124b49671209dc3677 Mon Sep 17 00:00:00 2001 From: Yicheng Qin Date: Wed, 4 Nov 2015 14:30:35 -0800 Subject: [PATCH 2/2] *: update feature maps to adopt v2.3.0 --- etcdserver/etcdhttp/capability.go | 1 + rafthttp/stream.go | 1 + 2 files changed, 2 insertions(+) diff --git a/etcdserver/etcdhttp/capability.go b/etcdserver/etcdhttp/capability.go index d69bea032..1f5ce686e 100644 --- a/etcdserver/etcdhttp/capability.go +++ b/etcdserver/etcdhttp/capability.go @@ -37,6 +37,7 @@ var ( capabilityMaps = map[string]map[capability]bool{ "2.1.0": {authCapability: true}, "2.2.0": {authCapability: true}, + "2.3.0": {authCapability: true}, } enableMapMu sync.Mutex diff --git a/rafthttp/stream.go b/rafthttp/stream.go index e83392e30..e01681239 100644 --- a/rafthttp/stream.go +++ b/rafthttp/stream.go @@ -48,6 +48,7 @@ var ( "2.0.0": {}, "2.1.0": {streamTypeMsgAppV2, streamTypeMessage}, "2.2.0": {streamTypeMsgAppV2, streamTypeMessage}, + "2.3.0": {streamTypeMsgAppV2, streamTypeMessage}, } )