diff options
| author | Paul Okstad <pokstad@gitlab.com> | 2020-07-22 19:27:13 +0300 |
|---|---|---|
| committer | Paul Okstad <pokstad@gitlab.com> | 2020-07-22 19:27:13 +0300 |
| commit | 9cfe1a01c214cd7c7c4e6bb2c84b231695d4b5c3 (patch) | |
| tree | 62c24e74cba800b573d9a9097272046f236747f1 | |
| parent | 0a59255b81476366290cd12aaf21728ee3d1cfc0 (diff) | |
Fix semantic merge conflict
| -rw-r--r-- | internal/praefect/coordinator_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/internal/praefect/coordinator_test.go b/internal/praefect/coordinator_test.go index 5f922f4c3..3336c21de 100644 --- a/internal/praefect/coordinator_test.go +++ b/internal/praefect/coordinator_test.go @@ -869,7 +869,7 @@ func TestStreamDirectorStorageScope(t *testing.T) { defer srv2.Stop() primaryAddress, secondaryAddress := "unix://"+gitalySocket0, "unix://"+gitalySocket1 - primaryGitaly := &config.Node{Address: primaryAddress, Storage: "gitaly-1", DefaultPrimary: true} + primaryGitaly := &config.Node{Address: primaryAddress, Storage: "gitaly-1"} secondaryGitaly := &config.Node{Address: secondaryAddress, Storage: "gitaly-2"} conf := config.Config{ Failover: config.Failover{Enabled: true}, |