From a827931b5189a82108b7ac45ddf9fe2dd0c319c0 Mon Sep 17 00:00:00 2001
From: spinlock <wnzheng@gmail.com>
Date: Wed, 15 Feb 2017 11:38:20 +0800
Subject: [PATCH] godep: upgrade

---
 Godeps/Godeps.json                            | 24 +++++++++----------
 .../github.com/garyburd/redigo/redis/conn.go  |  2 +-
 .../github.com/garyburd/redigo/redis/doc.go   |  2 +-
 vendor/golang.org/x/net/AUTHORS               |  3 +++
 vendor/golang.org/x/net/CONTRIBUTORS          |  3 +++
 5 files changed, 20 insertions(+), 14 deletions(-)
 create mode 100644 vendor/golang.org/x/net/AUTHORS
 create mode 100644 vendor/golang.org/x/net/CONTRIBUTORS

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index fd4f7acb9..ee07b763e 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,7 +1,7 @@
 {
 	"ImportPath": "github.com/CodisLabs/codis",
 	"GoVersion": "go1.7",
-	"GodepVersion": "v74",
+	"GodepVersion": "v79",
 	"Packages": [
 		"./..."
 	],
@@ -18,18 +18,18 @@
 		},
 		{
 			"ImportPath": "github.com/coreos/etcd/client",
-			"Comment": "v3.0.15",
-			"Rev": "fc00305a2e59b4c2d4a53c9fbb4d30741a96ea67"
+			"Comment": "v3.0.17",
+			"Rev": "cc198e22d3b8fd7ec98304c95e68ee375be54589"
 		},
 		{
 			"ImportPath": "github.com/coreos/etcd/pkg/pathutil",
-			"Comment": "v3.0.15",
-			"Rev": "fc00305a2e59b4c2d4a53c9fbb4d30741a96ea67"
+			"Comment": "v3.0.17",
+			"Rev": "cc198e22d3b8fd7ec98304c95e68ee375be54589"
 		},
 		{
 			"ImportPath": "github.com/coreos/etcd/pkg/types",
-			"Comment": "v3.0.15",
-			"Rev": "fc00305a2e59b4c2d4a53c9fbb4d30741a96ea67"
+			"Comment": "v3.0.17",
+			"Rev": "cc198e22d3b8fd7ec98304c95e68ee375be54589"
 		},
 		{
 			"ImportPath": "github.com/docopt/docopt-go",
@@ -38,13 +38,13 @@
 		},
 		{
 			"ImportPath": "github.com/garyburd/redigo/internal",
-			"Comment": "v1.0.0-16-g8c052d8",
-			"Rev": "8c052d82153967815d9093a7e9d3e7fd2e554861"
+			"Comment": "v1.0.0-20-g4854517",
+			"Rev": "48545177e92ae3e7bcdbd50b42f7a139e6a268da"
 		},
 		{
 			"ImportPath": "github.com/garyburd/redigo/redis",
-			"Comment": "v1.0.0-16-g8c052d8",
-			"Rev": "8c052d82153967815d9093a7e9d3e7fd2e554861"
+			"Comment": "v1.0.0-20-g4854517",
+			"Rev": "48545177e92ae3e7bcdbd50b42f7a139e6a268da"
 		},
 		{
 			"ImportPath": "github.com/go-martini/martini",
@@ -96,7 +96,7 @@
 		},
 		{
 			"ImportPath": "golang.org/x/net/context",
-			"Rev": "60c41d1de8da134c05b7b40154a9a82bf5b7edb9"
+			"Rev": "242b6b35177ec3909636b6cf6a47e8c2c6324b5d"
 		}
 	]
 }
diff --git a/vendor/github.com/garyburd/redigo/redis/conn.go b/vendor/github.com/garyburd/redigo/redis/conn.go
index 84c3b9c35..6ccace078 100644
--- a/vendor/github.com/garyburd/redigo/redis/conn.go
+++ b/vendor/github.com/garyburd/redigo/redis/conn.go
@@ -128,7 +128,7 @@ func DialPassword(password string) DialOption {
 }
 
 // DialTLSConfig specifies the config to use when a TLS connection is dialed.
-//  Has no effect when not dialing a TLS connection.
+// Has no effect when not dialing a TLS connection.
 func DialTLSConfig(c *tls.Config) DialOption {
 	return DialOption{func(do *dialOptions) {
 		do.tlsConfig = c
diff --git a/vendor/github.com/garyburd/redigo/redis/doc.go b/vendor/github.com/garyburd/redigo/redis/doc.go
index 5f7fdd2a6..bf5131a13 100644
--- a/vendor/github.com/garyburd/redigo/redis/doc.go
+++ b/vendor/github.com/garyburd/redigo/redis/doc.go
@@ -127,7 +127,7 @@
 // send and flush a subscription management command. The receive method
 // converts a pushed message to convenient types for use in a type switch.
 //
-//  psc := redis.PubSubConn{c}
+//  psc := redis.PubSubConn{Conn: c}
 //  psc.Subscribe("example")
 //  for {
 //      switch v := psc.Receive().(type) {
diff --git a/vendor/golang.org/x/net/AUTHORS b/vendor/golang.org/x/net/AUTHORS
new file mode 100644
index 000000000..15167cd74
--- /dev/null
+++ b/vendor/golang.org/x/net/AUTHORS
@@ -0,0 +1,3 @@
+# This source code refers to The Go Authors for copyright purposes.
+# The master list of authors is in the main Go distribution,
+# visible at http://tip.golang.org/AUTHORS.
diff --git a/vendor/golang.org/x/net/CONTRIBUTORS b/vendor/golang.org/x/net/CONTRIBUTORS
new file mode 100644
index 000000000..1c4577e96
--- /dev/null
+++ b/vendor/golang.org/x/net/CONTRIBUTORS
@@ -0,0 +1,3 @@
+# This source code was written by the Go contributors.
+# The master list of contributors is in the main Go distribution,
+# visible at http://tip.golang.org/CONTRIBUTORS.