resolve conflict

2026-10-20 09:16:07 +02:00 · 2021-12-03 19:19:43 +01:00
parent 8f2f70b4fe def9e1d688
commit 3804bc55c8
8 changed files with 57 additions and 24 deletions
@@ -464,11 +464,11 @@ spec:
                type: integer
              standby:
                type: object
-                required:
-                  - s3_wal_path
                properties:
                  s3_wal_path:
                    type: string
+                  gs_wal_path:
+                    type: string
              streams:
                type: array
                nullable: true