diff options
| author | John Cai <jcai@gitlab.com> | 2019-10-14 10:38:01 -0700 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2019-10-14 23:14:58 -0700 |
| commit | 3bb2d7c227bf802dbbd82726db0475aa39a50efc (patch) | |
| tree | 25cab8c7310d639b17bbf6b6aa2b2bebc98c7d55 /go/internal | |
| parent | 43e87e272cce800962ae7fddf4aae08992c1ead8 (diff) | |
| download | gitlab-shell-3bb2d7c227bf802dbbd82726db0475aa39a50efc.tar.gz | |
Upgrade Gitaly to 1.68.0jc-upgrade-gitaly
Gitaly 1.68.0 upgrades gRPC to 1.24.0
Diffstat (limited to 'go/internal')
| -rw-r--r-- | go/internal/command/receivepack/gitalycall.go | 2 | ||||
| -rw-r--r-- | go/internal/command/uploadarchive/gitalycall.go | 2 | ||||
| -rw-r--r-- | go/internal/command/uploadpack/gitalycall.go | 2 | ||||
| -rw-r--r-- | go/internal/gitlabnet/accessverifier/client.go | 2 | ||||
| -rw-r--r-- | go/internal/gitlabnet/accessverifier/client_test.go | 2 | ||||
| -rw-r--r-- | go/internal/gitlabnet/testserver/gitalyserver.go | 2 | ||||
| -rw-r--r-- | go/internal/handler/receive_pack.go | 2 | ||||
| -rw-r--r-- | go/internal/handler/upload_archive.go | 2 | ||||
| -rw-r--r-- | go/internal/handler/upload_pack.go | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/go/internal/command/receivepack/gitalycall.go b/go/internal/command/receivepack/gitalycall.go index 87ef9c5..d735f17 100644 --- a/go/internal/command/receivepack/gitalycall.go +++ b/go/internal/command/receivepack/gitalycall.go @@ -5,8 +5,8 @@ import ( "google.golang.org/grpc" - pb "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/client" + pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/shared/accessverifier" "gitlab.com/gitlab-org/gitlab-shell/go/internal/handler" diff --git a/go/internal/command/uploadarchive/gitalycall.go b/go/internal/command/uploadarchive/gitalycall.go index c899588..e810ba3 100644 --- a/go/internal/command/uploadarchive/gitalycall.go +++ b/go/internal/command/uploadarchive/gitalycall.go @@ -5,8 +5,8 @@ import ( "google.golang.org/grpc" - pb "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/client" + pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/accessverifier" "gitlab.com/gitlab-org/gitlab-shell/go/internal/handler" diff --git a/go/internal/command/uploadpack/gitalycall.go b/go/internal/command/uploadpack/gitalycall.go index 28d555c..5dff24a 100644 --- a/go/internal/command/uploadpack/gitalycall.go +++ b/go/internal/command/uploadpack/gitalycall.go @@ -5,8 +5,8 @@ import ( "google.golang.org/grpc" - pb "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/client" + pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet/accessverifier" "gitlab.com/gitlab-org/gitlab-shell/go/internal/handler" diff --git a/go/internal/gitlabnet/accessverifier/client.go b/go/internal/gitlabnet/accessverifier/client.go index 880fff5..eb67703 100644 --- a/go/internal/gitlabnet/accessverifier/client.go +++ b/go/internal/gitlabnet/accessverifier/client.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - pb "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" + pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet" diff --git a/go/internal/gitlabnet/accessverifier/client_test.go b/go/internal/gitlabnet/accessverifier/client_test.go index f534185..a4d1cb4 100644 --- a/go/internal/gitlabnet/accessverifier/client_test.go +++ b/go/internal/gitlabnet/accessverifier/client_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" - pb "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" + pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" "gitlab.com/gitlab-org/gitlab-shell/go/internal/command/commandargs" "gitlab.com/gitlab-org/gitlab-shell/go/internal/config" "gitlab.com/gitlab-org/gitlab-shell/go/internal/gitlabnet" diff --git a/go/internal/gitlabnet/testserver/gitalyserver.go b/go/internal/gitlabnet/testserver/gitalyserver.go index 35234c1..694fd41 100644 --- a/go/internal/gitlabnet/testserver/gitalyserver.go +++ b/go/internal/gitlabnet/testserver/gitalyserver.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc" - pb "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" + pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" ) type testGitalyServer struct{} diff --git a/go/internal/handler/receive_pack.go b/go/internal/handler/receive_pack.go index bb6ca89..4b97f54 100644 --- a/go/internal/handler/receive_pack.go +++ b/go/internal/handler/receive_pack.go @@ -4,8 +4,8 @@ import ( "context" "os" - pb "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/client" + pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/go/internal/handler/upload_archive.go b/go/internal/handler/upload_archive.go index eb2fa90..5180002 100644 --- a/go/internal/handler/upload_archive.go +++ b/go/internal/handler/upload_archive.go @@ -4,8 +4,8 @@ import ( "context" "os" - pb "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/client" + pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/go/internal/handler/upload_pack.go b/go/internal/handler/upload_pack.go index 1ce5ea3..e6b95bd 100644 --- a/go/internal/handler/upload_pack.go +++ b/go/internal/handler/upload_pack.go @@ -4,8 +4,8 @@ import ( "context" "os" - pb "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" "gitlab.com/gitlab-org/gitaly/client" + pb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" "google.golang.org/grpc" ) |