Skip to content

Commit

Permalink
Merge pull request #554 from uber/bump-tchannel
Browse files Browse the repository at this point in the history
Bump tchannel and unpin broken thrift
  • Loading branch information
Ryanfsdf committed Feb 7, 2019
2 parents e2fc19a + 641a902 commit dc53e7e
Show file tree
Hide file tree
Showing 38 changed files with 56 additions and 104 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 23 additions & 12 deletions glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions glide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ import:
version: ^0.8.0
- package: go.uber.org/atomic
version: ^1.3.0
- package: github.com/apache/thrift
version: ^0.10.0
subpackages:
- lib/go/thrift
- package: github.com/uber-go/tally
version: ^3
# update to master since the last semver release is 2 years old
Expand All @@ -28,7 +24,7 @@ import:
- package: go.uber.org/thriftrw
version: v1.14.0
- package: github.com/uber/tchannel-go
version: 1.5.0
version: ^1.5.0
- package: github.com/opentracing/opentracing-go
version: ^1.0.0
- package: github.com/uber/jaeger-client-go
Expand Down
2 changes: 0 additions & 2 deletions runtime/client_http_request_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,6 @@ func TestBarClientWithoutHeaders(t *testing.T) {

logs := gateway.AllLogs()

assert.Equal(t, 1, len(logs))

lines := logs["Got outbound request without mandatory header"]
assert.Equal(t, 1, len(lines))

Expand Down
Loading

0 comments on commit dc53e7e

Please sign in to comment.