public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-05 03:25:09 +02:00
Code Issues Projects Releases Wiki Activity

resolve conflict with latest config sync

Browse Source
This commit is contained in:
Felix Kunde
2021-10-18 17:23:46 +02:00
parent c8d89f9c65 720b4575c7
commit 2f4b554fec
46 changed files with 876 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/constants/postgresql.go
+2
View File
@@ -8,6 +8,8 @@ const (
PostgresDataMount = "/home/postgres/pgdata"
PostgresDataPath = PostgresDataMount + "/pgroot"
PatroniPGParametersParameterName = "parameters"
PostgresConnectRetryTimeout = 2 * time.Minute
PostgresConnectTimeout = 15 * time.Second