Felix Kunde 59f4d4e328 Merge branch 'master' into default-db-roles		2020-02-24 14:40:35 +01:00
..
apis/acid.zalan.do	Merge branch 'master' into default-db-roles	2020-02-24 14:40:35 +01:00
apiserver	reflect change in github url (#496)	2019-02-25 11:26:55 +01:00
cluster	merge with master and resolve conflicts	2020-02-19 15:28:15 +01:00
controller	merge with master and resolve conflicts	2020-02-19 15:28:15 +01:00
generated	update copyright in generated code (#779)	2020-01-02 17:34:49 +01:00
spec	PreparedDatabases with default role setup	2019-09-23 18:32:01 +02:00
util	Merge branch 'master' into default-db-roles	2020-02-24 14:40:35 +01:00