felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

Merge branch 'main' into v2

Browse Source 
* main:
  feat(config): expose folder and device info as metrics (fixes #9519) (#10148)
  chore: add issue types to GitHub issue templates
  build: remove schedule from PR metadata job
  chore(protocol): only allow enc. password changes on cluster config (#10145)
  chore(protocol): don't start connection routines a second time (#10146)
This commit is contained in:
Jakob Borg
2025-05-31 17:10:00 +02:00
parent d49df1e44c 1fdf07933c
commit 8d37e8f307
15 changed files with 132 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/model/requests_test.go
+1 -1
View File
@@ -1236,7 +1236,7 @@ func TestRequestIndexSenderClusterConfigBeforeStart(t *testing.T) {
}
return nil
})
fc.ClusterConfigCalls(func(cc *protocol.ClusterConfig) {
fc.ClusterConfigCalls(func(cc *protocol.ClusterConfig, _ map[string]string) {
select {
case ccChan <- cc:
case <-done: