From 5da5b834e56236804da5c070802dc3a7eb3d490f Mon Sep 17 00:00:00 2001
From: Anthony Romano <anthony.romano@coreos.com>
Date: Thu, 2 Mar 2017 13:16:47 -0800
Subject: [PATCH 1/2] api: default to V3 capability

Fixes #7154
---
 etcdserver/api/capability.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/etcdserver/api/capability.go b/etcdserver/api/capability.go
index ae23cdf7d..5e2de58e9 100644
--- a/etcdserver/api/capability.go
+++ b/etcdserver/api/capability.go
@@ -33,9 +33,7 @@ var (
 	plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdserver/api")
 
 	// capabilityMaps is a static map of version to capability map.
-	// the base capabilities is the set of capability 2.0 supports.
 	capabilityMaps = map[string]map[Capability]bool{
-		"2.3.0": {AuthCapability: true},
 		"3.0.0": {AuthCapability: true, V3rpcCapability: true},
 		"3.1.0": {AuthCapability: true, V3rpcCapability: true},
 		"3.2.0": {AuthCapability: true, V3rpcCapability: true},
@@ -49,7 +47,10 @@ var (
 )
 
 func init() {
-	enabledMap = make(map[Capability]bool)
+	enabledMap = map[Capability]bool{
+		AuthCapability:  true,
+		V3rpcCapability: true,
+	}
 }
 
 // UpdateCapability updates the enabledMap when the cluster version increases.

From 1753623f87b6f5439d70a3c18222336bdd34f0ed Mon Sep 17 00:00:00 2001
From: Anthony Romano <anthony.romano@coreos.com>
Date: Thu, 2 Mar 2017 13:17:19 -0800
Subject: [PATCH 2/2] integration: don't set v3 capability since now default

---
 integration/cluster.go | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/integration/cluster.go b/integration/cluster.go
index a64f024ee..72d51a1fe 100644
--- a/integration/cluster.go
+++ b/integration/cluster.go
@@ -37,7 +37,6 @@ import (
 	"github.com/coreos/etcd/client"
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/etcdserver"
-	"github.com/coreos/etcd/etcdserver/api"
 	"github.com/coreos/etcd/etcdserver/api/v2http"
 	"github.com/coreos/etcd/etcdserver/api/v3rpc"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
@@ -89,11 +88,6 @@ type cluster struct {
 	Members []*member
 }
 
-func init() {
-	// manually enable v3 capability since we know the cluster members all support v3.
-	api.EnableCapability(api.V3rpcCapability)
-}
-
 func schemeFromTLSInfo(tls *transport.TLSInfo) string {
 	if tls == nil {
 		return UrlScheme