Merge pull request #19706 from jonboulle/master

Automatic merge from submit-queue

Remove unused coreos/go-etcd fork from third_party

third_party/forked/coreos/go-etcd/etcd/client.go

@@ -1,32 +0,0 @@
-package etcd
-
-import (
-	"errors"
-	"net"
-	"time"
-)
-
-// dial attempts to open a TCP connection to the provided address, explicitly
-// enabling keep-alives with a one-second interval.
-func Dial(network, addr string) (net.Conn, error) {
-	conn, err := net.DialTimeout(network, addr, time.Second)
-	if err != nil {
-		return nil, err
-	}
-
-	tcpConn, ok := conn.(*net.TCPConn)
-	if !ok {
-		return nil, errors.New("Failed type-assertion of net.Conn as *net.TCPConn")
-	}
-
-	// Keep TCP alive to check whether or not the remote machine is down
-	if err = tcpConn.SetKeepAlive(true); err != nil {
-		return nil, err
-	}
-
-	if err = tcpConn.SetKeepAlivePeriod(time.Second); err != nil {
-		return nil, err
-	}
-
-	return tcpConn, nil
-}