Murat Kabilov 1a4cff6574 Merge branch 'master' into feature/diagnostic-rest-api ... # Conflicts: # pkg/controller/controller.go		2017-07-27 14:35:51 +02:00
..
controller.go	Merge branch 'master' into feature/diagnostic-rest-api	2017-07-27 14:35:51 +02:00
pod.go	Remove pod dispatcher	2017-07-27 14:16:49 +02:00
postgresql.go	Fix graceful shutdown	2017-07-27 12:54:22 +02:00
status.go	go fmt	2017-07-27 11:27:08 +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