Merge pull request kubernetes#5194 from ncdc/4882-fix-flaky-spdy-test…

…s-osx bump(docker/spdystream):e731c8f9f19ffd7e51a469a2de1580c1dfbb4fae
duda · Mar 10, 2015 · 420b6cd · 420b6cd
2 parents 8fd3347 + 1171bca
commit 420b6cd
Show file tree

Hide file tree

Showing 4 changed files with 131 additions and 38 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/docker/spdystream/connection.go b/Godeps/_workspace/src/github.com/docker/spdystream/connection.go
diff --git a/Godeps/_workspace/src/github.com/docker/spdystream/spdy_test.go b/Godeps/_workspace/src/github.com/docker/spdystream/spdy_test.go
diff --git a/Godeps/_workspace/src/github.com/docker/spdystream/stream.go b/Godeps/_workspace/src/github.com/docker/spdystream/stream.go