From e4435c741717ace025c07a5b797928a088ab3eb4 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Mon, 27 Apr 2015 14:07:10 -0700 Subject: [PATCH] Update golang spdy to new path. Upstream golang spdy was moved to x/net/spdy and then deleted. This vendors in the last revision and updates the only user of it. --- Godeps/Godeps.json | 12 ++++++------ .../src/github.com/docker/spdystream/connection.go | 2 +- .../src/github.com/docker/spdystream/priority.go | 3 ++- .../github.com/docker/spdystream/priority_test.go | 3 ++- .../src/github.com/docker/spdystream/stream.go | 2 +- .../p/go.net => golang.org/x/net}/spdy/dictionary.go | 0 .../p/go.net => golang.org/x/net}/spdy/read.go | 0 .../p/go.net => golang.org/x/net}/spdy/spdy_test.go | 0 .../p/go.net => golang.org/x/net}/spdy/types.go | 2 +- .../p/go.net => golang.org/x/net}/spdy/write.go | 0 10 files changed, 13 insertions(+), 11 deletions(-) rename Godeps/_workspace/src/{code.google.com/p/go.net => golang.org/x/net}/spdy/dictionary.go (100%) rename Godeps/_workspace/src/{code.google.com/p/go.net => golang.org/x/net}/spdy/read.go (100%) rename Godeps/_workspace/src/{code.google.com/p/go.net => golang.org/x/net}/spdy/spdy_test.go (100%) rename Godeps/_workspace/src/{code.google.com/p/go.net => golang.org/x/net}/spdy/types.go (99%) rename Godeps/_workspace/src/{code.google.com/p/go.net => golang.org/x/net}/spdy/write.go (100%) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 1df8da5ab34..29faf1bbc10 100644 --- a/Godeps/Godeps.json +++ b/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" diff --git a/Godeps/_workspace/src/github.com/docker/spdystream/connection.go b/Godeps/_workspace/src/github.com/docker/spdystream/connection.go index 6e623c46784..9853cfc8433 100644 --- a/Godeps/_workspace/src/github.com/docker/spdystream/connection.go +++ b/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 ( diff --git a/Godeps/_workspace/src/github.com/docker/spdystream/priority.go b/Godeps/_workspace/src/github.com/docker/spdystream/priority.go index abc3291bc75..27a22594564 100644 --- a/Godeps/_workspace/src/github.com/docker/spdystream/priority.go +++ b/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 { diff --git a/Godeps/_workspace/src/github.com/docker/spdystream/priority_test.go b/Godeps/_workspace/src/github.com/docker/spdystream/priority_test.go index 38cf225e1d1..0e89665c2d6 100644 --- a/Godeps/_workspace/src/github.com/docker/spdystream/priority_test.go +++ b/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) { diff --git a/Godeps/_workspace/src/github.com/docker/spdystream/stream.go b/Godeps/_workspace/src/github.com/docker/spdystream/stream.go index 45e65c1be84..5c7467f129a 100644 --- a/Godeps/_workspace/src/github.com/docker/spdystream/stream.go +++ b/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 ( diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/spdy/dictionary.go b/Godeps/_workspace/src/golang.org/x/net/spdy/dictionary.go similarity index 100% rename from Godeps/_workspace/src/code.google.com/p/go.net/spdy/dictionary.go rename to Godeps/_workspace/src/golang.org/x/net/spdy/dictionary.go diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/spdy/read.go b/Godeps/_workspace/src/golang.org/x/net/spdy/read.go similarity index 100% rename from Godeps/_workspace/src/code.google.com/p/go.net/spdy/read.go rename to Godeps/_workspace/src/golang.org/x/net/spdy/read.go diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/spdy/spdy_test.go b/Godeps/_workspace/src/golang.org/x/net/spdy/spdy_test.go similarity index 100% rename from Godeps/_workspace/src/code.google.com/p/go.net/spdy/spdy_test.go rename to Godeps/_workspace/src/golang.org/x/net/spdy/spdy_test.go diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/spdy/types.go b/Godeps/_workspace/src/golang.org/x/net/spdy/types.go similarity index 99% rename from Godeps/_workspace/src/code.google.com/p/go.net/spdy/types.go rename to Godeps/_workspace/src/golang.org/x/net/spdy/types.go index 7b6ee9c6f2b..f0b6d2b4752 100644 --- a/Godeps/_workspace/src/code.google.com/p/go.net/spdy/types.go +++ b/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" diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/spdy/write.go b/Godeps/_workspace/src/golang.org/x/net/spdy/write.go similarity index 100% rename from Godeps/_workspace/src/code.google.com/p/go.net/spdy/write.go rename to Godeps/_workspace/src/golang.org/x/net/spdy/write.go