diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-01-14 13:29:56 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-01-14 14:52:18 +0300 |
| commit | c07aae65345e7da6929eb03e5085ea9093c020cf (patch) | |
| tree | cc0db5314fce8e6caf8844db75d9ccfbdae8b831 /internal/rubyserver | |
| parent | 4f46cf40ea14cb15157143a79fae3d8dcee38963 (diff) | |
Replace net/context with context package
Leveraging `go fix` these changes were made, I only applied some regexp
to get the import grouping correct.
The old package can't be removed from vendor directory yet, as other
dependencies depend on it.
Diffstat (limited to 'internal/rubyserver')
| -rw-r--r-- | internal/rubyserver/health.go | 2 | ||||
| -rw-r--r-- | internal/rubyserver/rubyserver.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/internal/rubyserver/health.go b/internal/rubyserver/health.go index 10550d7dc..cc6005f89 100644 --- a/internal/rubyserver/health.go +++ b/internal/rubyserver/health.go @@ -1,9 +1,9 @@ package rubyserver import ( + "context" "time" - "golang.org/x/net/context" "google.golang.org/grpc" healthpb "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/internal/rubyserver/rubyserver.go b/internal/rubyserver/rubyserver.go index 672853ef7..8eab03025 100644 --- a/internal/rubyserver/rubyserver.go +++ b/internal/rubyserver/rubyserver.go @@ -1,6 +1,7 @@ package rubyserver import ( + "context" "fmt" "io/ioutil" "os" @@ -24,7 +25,6 @@ import ( "gitlab.com/gitlab-org/gitaly/streamio" grpccorrelation "gitlab.com/gitlab-org/labkit/correlation/grpc" grpctracing "gitlab.com/gitlab-org/labkit/tracing/grpc" - "golang.org/x/net/context" "google.golang.org/grpc" ) |