Murat Kabilov acebdf0122 Merge branch 'feature/refactor-tpr' into fix/graceful-shutdown ... # Conflicts: # pkg/controller/controller.go		2017-07-25 10:38:33 +02:00
..
controller.go	remove teams api client from controller and make it per cluster	2017-07-25 01:01:49 +02:00
pod.go	Merge branch 'feature/refactor-tpr' into fix/graceful-shutdown	2017-07-25 10:38:33 +02:00
postgresql.go	Merge branch 'feature/refactor-tpr' into fix/graceful-shutdown	2017-07-25 10:38:33 +02:00
util.go	split init controller; make controller config private	2017-07-25 00:35:52 +02:00
util_test.go	fix controller util test	2017-07-25 00:36:10 +02:00