add enableConnectionPool to validation and some nior fixes

2020-02-13 14:15:57 +01:00 · 2020-02-13 14:15:57 +01:00 · 99f2b038b5
parent c9a1c8e6b4 2384e1ec10
commit 99f2b038b5
1 changed files with 4 additions and 0 deletions
--- a/manifests/operatorconfiguration.crd.yaml
+++ b/manifests/operatorconfiguration.crd.yaml
@ -303,7 +303,11 @@ spec:
                connection_pool_user:
                  type: string
                  #default: "pooler"
+<<<<<<< HEAD
                connection_pool_replicas:
+=======
+                connection_pool_instances_number:
+>>>>>>> 2384e1ec10638e1989c0295ffb7fbe96af2e2f1a
                  type: integer
                  #default: 1
                connection_pool_image: