Merge pull request #7392 from thockin/golang-spdy-dep

Update golang spdy to new path.

Godeps/Godeps.json

@@ -24,11 +24,6 @@
 			"Comment": "null-75",
 			"Rev": "bd8df7009305d6ada223ea3c95b94c0f38bfa119"
 		},
-		{
-			"ImportPath": "code.google.com/p/go.net/spdy",
-			"Comment": "null-240",
-			"Rev": "937a34c9de13c766c814510f76bca091dee06028"
-		},
 		{
 			"ImportPath": "code.google.com/p/google-api-go-client/compute/v1",
 			"Comment": "release-96",
@@ -147,7 +142,7 @@
 		},
 		{
 			"ImportPath": "github.com/docker/spdystream",
-			"Rev": "99515db39d3dad9607e0293f18152f3d59da76dc"
+			"Rev": "83ae67e694a4ab5cbaee4d3126f25118712b26e6"
 		},
 		{
 			"ImportPath": "github.com/elazarl/go-bindata-assetfs",
@@ -424,6 +419,11 @@
 			"ImportPath": "golang.org/x/net/html",
 			"Rev": "cbcac7bb8415db9b6cb4d1ebab1dc9afbd688b97"
 		},
+		{
+			"ImportPath": "golang.org/x/net/spdy",
+			"Comment": "deleted-upstream",
+			"Rev": "d175081df37eff8cda13f478bc11a0a65b39958b"
+		},
 		{
 			"ImportPath": "golang.org/x/net/websocket",
 			"Rev": "cbcac7bb8415db9b6cb4d1ebab1dc9afbd688b97"

Godeps/_workspace/src/github.com/docker/spdystream/connection.go

@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"code.google.com/p/go.net/spdy"
+	"golang.org/x/net/spdy"
 )
 
 var (

Godeps/_workspace/src/github.com/docker/spdystream/priority.go

@@ -1,9 +1,10 @@
 package spdystream
 
 import (
-	"code.google.com/p/go.net/spdy"
 	"container/heap"
 	"sync"
+
+	"golang.org/x/net/spdy"
 )
 
 type prioritizedFrame struct {

Godeps/_workspace/src/github.com/docker/spdystream/priority_test.go

@@ -1,10 +1,11 @@
 package spdystream
 
 import (
-	"code.google.com/p/go.net/spdy"
 	"sync"
 	"testing"
 	"time"
+
+	"golang.org/x/net/spdy"
 )
 
 func TestPriorityQueueOrdering(t *testing.T) {

Godeps/_workspace/src/github.com/docker/spdystream/stream.go

@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"code.google.com/p/go.net/spdy"
+	"golang.org/x/net/spdy"
 )
 
 var (

Godeps/_workspace/src/golang.org/x/net/spdy/types.go

@@ -4,7 +4,7 @@
 
 // Package spdy implements the SPDY protocol (currently SPDY/3), described in
 // http://www.chromium.org/spdy/spdy-protocol/spdy-protocol-draft3.
-package spdy
+package spdy // import "golang.org/x/net/spdy"
 
 import (
 	"bytes"