diff options
author | Pablo Carranza <pcarranza@gmail.com> | 2016-12-20 16:56:48 +0300 |
---|---|---|
committer | Pablo Carranza <pcarranza@gmail.com> | 2016-12-20 16:56:48 +0300 |
commit | e8a7da9cc5f3f66493e215739ffe1c234c228af8 (patch) | |
tree | 4f19b901356d518cf0c7a89a5047ec64b922ed39 | |
parent | e1ed0d21e77c4c0b7e24948c5bd11f4e0ecff8b0 (diff) | |
parent | 92d1fabbd40b06cf3058f41706cc8ecf8b7015fc (diff) |
Merge branch 'fix/rename-to-gitaly' into 'master'
Rename package to gitaly
See merge request !13
-rw-r--r-- | .gitignore | 4 | ||||
-rw-r--r-- | Makefile | 6 | ||||
-rw-r--r-- | client/client.go | 2 | ||||
-rw-r--r-- | client/client_test.go | 2 | ||||
-rw-r--r-- | cmd/client/main.go | 2 | ||||
-rw-r--r-- | cmd/server/main.go | 2 | ||||
-rw-r--r-- | server/command_executor.go | 2 | ||||
-rw-r--r-- | server/command_executor_test.go | 2 | ||||
-rw-r--r-- | server/server.go | 2 | ||||
-rw-r--r-- | server/server_test.go | 2 | ||||
-rw-r--r-- | vendor/vendor.json | 2 |
11 files changed, 14 insertions, 14 deletions
diff --git a/.gitignore b/.gitignore index c1c3d9944..8e82acad5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ client/testdata/data _build vendor/*/ -git-daemon-client -git-daemon-server +gitaly-client +gitaly-server @@ -1,7 +1,7 @@ -PKG=gitlab.com/gitlab-org/git-access-daemon +PKG=gitlab.com/gitlab-org/gitaly BUILD_DIR=$(shell pwd) -CLIENT_BIN=git-daemon-client -SERVER_BIN=git-daemon-server +CLIENT_BIN=gitaly-client +SERVER_BIN=gitaly-server export GOPATH=${BUILD_DIR}/_build export PATH:=${GOPATH}/bin:$(PATH) diff --git a/client/client.go b/client/client.go index 246771573..941217830 100644 --- a/client/client.go +++ b/client/client.go @@ -8,7 +8,7 @@ import ( "net" "os" - "gitlab.com/gitlab-org/git-access-daemon/messaging" + "gitlab.com/gitlab-org/gitaly/messaging" ) type Client struct { diff --git a/client/client_test.go b/client/client_test.go index 3b446a926..36764d91e 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - serv "gitlab.com/gitlab-org/git-access-daemon/server" + serv "gitlab.com/gitlab-org/gitaly/server" ) const serverAddress = "127.0.0.1:6667" diff --git a/cmd/client/main.go b/cmd/client/main.go index b00413fe6..1b92aac19 100644 --- a/cmd/client/main.go +++ b/cmd/client/main.go @@ -3,7 +3,7 @@ package main import ( "os" - "gitlab.com/gitlab-org/git-access-daemon/client" + "gitlab.com/gitlab-org/gitaly/client" ) func main() { diff --git a/cmd/server/main.go b/cmd/server/main.go index e37665464..d1e51c3e0 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -5,7 +5,7 @@ import ( "os/signal" "syscall" - serv "gitlab.com/gitlab-org/git-access-daemon/server" + serv "gitlab.com/gitlab-org/gitaly/server" ) func main() { diff --git a/server/command_executor.go b/server/command_executor.go index 284c74644..8f5b9b1fc 100644 --- a/server/command_executor.go +++ b/server/command_executor.go @@ -7,7 +7,7 @@ import ( "os/exec" "syscall" - "gitlab.com/gitlab-org/git-access-daemon/messaging" + "gitlab.com/gitlab-org/gitaly/messaging" ) func CommandExecutor(chans *commChans) { diff --git a/server/command_executor_test.go b/server/command_executor_test.go index 4fb1fd0cf..f10377d51 100644 --- a/server/command_executor_test.go +++ b/server/command_executor_test.go @@ -3,7 +3,7 @@ package server import ( "testing" - "gitlab.com/gitlab-org/git-access-daemon/messaging" + "gitlab.com/gitlab-org/gitaly/messaging" ) func TestRunningCommandSuccessfully(t *testing.T) { diff --git a/server/server.go b/server/server.go index 18f68531a..5541e5683 100644 --- a/server/server.go +++ b/server/server.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "gitlab.com/gitlab-org/git-access-daemon/messaging" + "gitlab.com/gitlab-org/gitaly/messaging" ) type Server struct { diff --git a/server/server_test.go b/server/server_test.go index 81bb318e8..36c16997f 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "gitlab.com/gitlab-org/git-access-daemon/messaging" + "gitlab.com/gitlab-org/gitaly/messaging" ) func TestServerStandingUp(t *testing.T) { diff --git a/vendor/vendor.json b/vendor/vendor.json index 19ecc88d2..88e50e10f 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -9,5 +9,5 @@ "revisionTime": "2016-11-17T03:31:26Z" } ], - "rootPath": "gitlab.com/gitlab-org/git-access-daemon" + "rootPath": "gitlab.com/gitlab-org/gitaly" } |