Commit 7a629dda authored by Evan Read's avatar Evan Read

Merge branch 'bbodenmiller-master-patch-93468' into 'master'

Improve wording of GitLab server also running Gitaly

See merge request gitlab-org/gitlab!77321
parents 4335649b 9f472a9d
...@@ -476,7 +476,7 @@ example: ...@@ -476,7 +476,7 @@ example:
```ruby ```ruby
git_data_dirs({ git_data_dirs({
'default' => { 'gitaly_address' => 'tcp://gitaly1.internal:8075' }, 'default' => { 'gitaly_address' => 'tcp://gitaly1.internal:8075' },
# Address of the GitLab server that has Gitaly running on it # Address of the GitLab server that also has Gitaly running on it
'storage1' => { 'gitaly_address' => 'tcp://gitlab.internal:8075', 'path' => '/mnt/gitlab/git-data' }, 'storage1' => { 'gitaly_address' => 'tcp://gitlab.internal:8075', 'path' => '/mnt/gitlab/git-data' },
'storage2' => { 'gitaly_address' => 'tcp://gitaly2.internal:8075' }, 'storage2' => { 'gitaly_address' => 'tcp://gitaly2.internal:8075' },
}) })
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment