From 35c5dcefc282419b85137735961c33d18e59d35c Mon Sep 17 00:00:00 2001
From: Anthony Romano <anthony.romano@coreos.com>
Date: Sat, 19 Aug 2017 18:22:58 -0700
Subject: [PATCH] *: cockroachdb/cmux -> soheilhy/cmux

Has fixes not in fork. Includes SetReadTimeout.
---
 embed/etcd.go          | 2 +-
 embed/serve.go         | 4 ++--
 etcdmain/grpc_proxy.go | 2 +-
 integration/cluster.go | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/embed/etcd.go b/embed/etcd.go
index fbf20d853..5959f4059 100644
--- a/embed/etcd.go
+++ b/embed/etcd.go
@@ -38,7 +38,7 @@ import (
 	"github.com/coreos/etcd/rafthttp"
 	"github.com/coreos/pkg/capnslog"
 
-	"github.com/cockroachdb/cmux"
+	"github.com/soheilhy/cmux"
 	"google.golang.org/grpc"
 )
 
diff --git a/embed/serve.go b/embed/serve.go
index 3e9b37ea0..6af237432 100644
--- a/embed/serve.go
+++ b/embed/serve.go
@@ -34,8 +34,8 @@ import (
 	"github.com/coreos/etcd/pkg/debugutil"
 	"github.com/coreos/etcd/pkg/transport"
 
-	"github.com/cockroachdb/cmux"
 	gw "github.com/grpc-ecosystem/grpc-gateway/runtime"
+	"github.com/soheilhy/cmux"
 	"golang.org/x/net/context"
 	"golang.org/x/net/trace"
 	"google.golang.org/grpc"
@@ -152,7 +152,7 @@ func (sctx *serveCtx) serve(s *etcdserver.EtcdServer, tlsinfo *transport.TLSInfo
 }
 
 // grpcHandlerFunc returns an http.Handler that delegates to grpcServer on incoming gRPC
-// connections or otherHandler otherwise. Copied from cockroachdb.
+// connections or otherHandler otherwise. Given in gRPC docs.
 func grpcHandlerFunc(grpcServer *grpc.Server, otherHandler http.Handler) http.Handler {
 	if otherHandler == nil {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
diff --git a/etcdmain/grpc_proxy.go b/etcdmain/grpc_proxy.go
index 183b20c19..27dcac375 100644
--- a/etcdmain/grpc_proxy.go
+++ b/etcdmain/grpc_proxy.go
@@ -37,8 +37,8 @@ import (
 	"github.com/coreos/etcd/pkg/transport"
 	"github.com/coreos/etcd/proxy/grpcproxy"
 
-	"github.com/cockroachdb/cmux"
 	grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
+	"github.com/soheilhy/cmux"
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
 )
diff --git a/integration/cluster.go b/integration/cluster.go
index 7948566ac..7dcfdcdd4 100644
--- a/integration/cluster.go
+++ b/integration/cluster.go
@@ -31,7 +31,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cockroachdb/cmux"
+	"github.com/soheilhy/cmux"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"