public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

clean up merge conflict

This commit is contained in:
Felix Kunde 2020-02-13 14:19:15 +01:00
parent 99f2b038b5
commit 4f2457bbe8
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/operatorconfiguration.crd.yaml
View File

@ -303,11 +303,7 @@ spec:
connection_pool_user: connection_pool_user:
type: string type: string
#default: "pooler" #default: "pooler"
<<<<<<< HEAD
connection_pool_replicas: connection_pool_replicas:
=======
connection_pool_instances_number:
>>>>>>> 2384e1ec10638e1989c0295ffb7fbe96af2e2f1a
type: integer type: integer
#default: 1 #default: 1
connection_pool_image: connection_pool_image: