merge with dev and resolve conflicts

2025-12-07 09:42:46 +01:00 · 2020-07-10 16:27:10 -04:00
parent 9730c4561d 755f47da2d
commit 13af4cacb0
29 changed files with 205 additions and 373 deletions
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1048,6 +1048,11 @@ manager_static() {
 		"      warm: 7"\
 		"      close: 30"\
 		"      delete: 365"\
+		"    so-flow:"\
+		"      shards: 1"\
+		"      warm: 7"\
+		"      close: 30"\
+		"      delete: 365"\
 		"    so-ids:"\
 		"      shards: 1"\
 		"      warm: 7"\