sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-09-18 04:39:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts with main

Browse Source
This commit is contained in:
Viktor Liu
2026-05-20 15:38:01 +02:00
parent d705dac572 9192b4f029
commit fd8a21d3a0
23 changed files with 397 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
management/server/http/handlers/proxy/auth_callback_integration_test.go
+1 -1
View File
@@ -444,7 +444,7 @@ func (m *testServiceManager) GetServiceByDomain(ctx context.Context, domain stri
return m.store.GetServiceByDomain(ctx, domain)
}
func (m *testServiceManager) GetActiveClusters(_ context.Context, _, _ string) ([]nbproxy.Cluster, error) {
func (m *testServiceManager) GetClusters(_ context.Context, _, _ string) ([]nbproxy.Cluster, error) {
return nil, nil
}