Sergey Dudoladov 9d64f6d644 resolve conflicts

2020-04-28 08:12:19 +02:00

..

api-service.yaml

[UI] add tab for monthly costs per cluster (#796)

2020-02-19 12:58:24 +01:00

complete-postgres-manifest.yaml

fix typo in additionalVolume struct (#933)

2020-04-27 12:22:42 +02:00

configmap.yaml

Merge branch 'master' into lazy-update

2020-04-08 06:22:01 +02:00

fake-teams-api.yaml

…

infrastructure-roles-configmap.yaml

Improve infrastructure role definitions (#208)

2018-04-04 17:21:36 +02:00

infrastructure-roles.yaml

Improve infrastructure role definitions (#208)

2018-04-04 17:21:36 +02:00

kustomization.yaml

[UI] add tab for monthly costs per cluster (#796)

2020-02-19 12:58:24 +01:00

minimal-postgres-manifest.yaml

fix minor issues in docs and manifests (#866)

2020-03-18 15:02:13 +01:00

operator-service-account-rbac.yaml

Emit K8S events to the postgresql CR as feedback to the requestor / user (#896)

2020-04-27 08:22:07 +02:00

operatorconfiguration.crd.yaml

resolve conflicts

2020-04-28 08:12:19 +02:00

platform-credentials.yaml

…

postgres-operator.yaml

define ownership between operator and clusters via annotation (#802)

2020-03-17 16:34:31 +01:00

postgresql-operator-default-configuration.yaml

resolve conflicts

2020-04-28 08:12:19 +02:00

postgresql.crd.yaml

make tls pr798 use additionalVolumes capability from pr736 (#920)

2020-04-15 15:24:55 +02:00

standby-manifest.yaml

fix minor issues in docs and manifests (#866)

2020-03-18 15:02:13 +01:00

user-facing-clusterroles.yaml

postgres-pod clusterrole (#832)

2020-02-19 12:32:54 +01:00