public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-04 17:33:12 +02:00
Code Issues Projects Releases Wiki Activity

conflict resolution for master merge

Browse Source
This commit is contained in:
Rafia Sabih
2020-10-27 17:42:23 +01:00
parent d2c410d72b e97235aa39
commit 2d20982913
21 changed files with 458 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/reference/command_line_and_environment.md
+4
View File
@@ -56,3 +56,7 @@ The following environment variables are accepted by the operator:
* **CRD_READY_WAIT_INTERVAL**
defines the interval between consecutive attempts waiting for the
`postgresql` CRD to be created. The default is 5s.
* **ENABLE_JSON_LOGGING**
Set to `true` for JSON formatted logging output.
The default is false.