resolve conflicts with master · dde4ba8aca - postgres-operator - Gitea: Git with a cup of tea

public_git/postgres-operator

mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-20 06:13:26 +02:00

resolve conflicts with master

This commit is contained in:

Felix Kunde

2019-05-08 12:54:09 +02:00

parent 3a7d503fe0 0fbfbb23bb

commit dde4ba8aca

18 changed files with 373 additions and 213 deletions

									
										charts/postgres-operator/templates/clusterrole.yaml
									
		+1
		
												View File
												
				@@ -13,6 +13,7 @@ rules:

				  - acid.zalan.do

				  resources:

				  - postgresqls

				  - postgresqls/status

				  - operatorconfigurations

				  verbs:

				  - "*"