github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Update golang spdy to new path.
This commit is contained in:
Daniel Smith 2015-04-27 18:01:12 -07:00
commit 082757ccbb
10 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Godeps/Godeps.json generated
View File

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

2
Godeps/_workspace/src/github.com/docker/spdystream/connection.go generated vendored
View File

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

3
Godeps/_workspace/src/github.com/docker/spdystream/priority.go generated vendored
View File

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

3
Godeps/_workspace/src/github.com/docker/spdystream/priority_test.go generated vendored
View File

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

2
Godeps/_workspace/src/github.com/docker/spdystream/stream.go generated vendored
View File

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

0
Godeps/_workspace/src/code.google.com/p/go.net/spdy/dictionary.go → Godeps/_workspace/src/golang.org/x/net/spdy/dictionary.go generated vendored
View File

0
Godeps/_workspace/src/code.google.com/p/go.net/spdy/read.go → Godeps/_workspace/src/golang.org/x/net/spdy/read.go generated vendored
View File

0
Godeps/_workspace/src/code.google.com/p/go.net/spdy/spdy_test.go → Godeps/_workspace/src/golang.org/x/net/spdy/spdy_test.go generated vendored
View File

2
Godeps/_workspace/src/code.google.com/p/go.net/spdy/types.go → Godeps/_workspace/src/golang.org/x/net/spdy/types.go generated vendored
View File

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

0
Godeps/_workspace/src/code.google.com/p/go.net/spdy/write.go → Godeps/_workspace/src/golang.org/x/net/spdy/write.go generated vendored
View File