Murat Kabilov 54defa8070 Merge branch 'fix/graceful-shutdown' into feature/diagnostic-rest-api ... # Conflicts: # pkg/controller/controller.go # pkg/controller/pod.go # pkg/controller/postgresql.go		2017-07-25 17:09:22 +02:00
..
controller.go	fix strange argument order	2017-07-25 15:55:07 +02:00
pod.go	Merge branch 'master' into feature/diagnostic-rest-api	2017-07-25 16:38:40 +02:00
postgresql.go	Merge branch 'master' into feature/diagnostic-rest-api	2017-07-25 16:38:40 +02:00
rest-server.go	diagnostic rest api [WIP]	2017-07-14 15:58:59 +02:00
util.go	Make use of kubernetes client-go v4	2017-07-25 15:25:17 +02:00
util_test.go	Make use of kubernetes client-go v4	2017-07-25 15:25:17 +02:00