Skip to content

Commit 58d99f7

Browse files
StevenYCChoujkohen
authored andcommitted
vendor: update grpc and dependent package. (#89)
* vendor: update grpc package to v1.18.0. In order to use grpc package in v1.18.0, the following dependent vendor packages are updated: - github.com/golang/protobuf/proto - golang.org/x/sys/unix - google.golang.org/grpc - google.golang.org/grpc/balancer - google.golang.org/grpc/credentials - google.golang.org/grpc/internal - google.golang.org/grpc/stats - google.golang.org/grpc/resolver The following package are removed because grpc v1.18.0 uses context package in standard library. - golang.org/x/net/context - golang.org/x/net/context/ctxhttp * Use context package in standard library. * Add back packages under golang.org/x/net/context. Some vendored package still use packages under golang.org/x/net/context, the following two packages are added back and updated to latest version: - golang.org/x/net/context - golang.org/x/net/context/ctxhttp
1 parent b48660b commit 58d99f7

File tree

362 files changed

+150939
-41372
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

362 files changed

+150939
-41372
lines changed

bench/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ limitations under the License.
1313
package main
1414

1515
import (
16+
"context"
1617
"flag"
1718
"fmt"
1819
"io/ioutil"
@@ -25,7 +26,6 @@ import (
2526
"github.com/golang/protobuf/ptypes/empty"
2627
grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
2728
"github.com/prometheus/client_golang/prometheus/promhttp"
28-
"golang.org/x/net/context"
2929
monitoring_pb "google.golang.org/genproto/googleapis/monitoring/v3"
3030
"google.golang.org/grpc"
3131
)

stackdriver/test_server.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ limitations under the License.
1313
package stackdriver
1414

1515
import (
16+
"context"
17+
1618
empty_pb "github.com/golang/protobuf/ptypes/empty"
17-
context "golang.org/x/net/context"
1819
metric_pb "google.golang.org/genproto/googleapis/api/metric"
1920
monitoredres_pb "google.golang.org/genproto/googleapis/api/monitoredres"
2021
monitoring_pb "google.golang.org/genproto/googleapis/monitoring/v3"

vendor/github.com/golang/protobuf/LICENSE

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/golang/protobuf/proto/Makefile

Lines changed: 0 additions & 43 deletions
This file was deleted.

vendor/github.com/golang/protobuf/proto/clone.go

Lines changed: 35 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)