Murat Kabilov 289980f1e1 Merge branch 'feature/simplify-pod-events-processing' into client-go-3 ... # Conflicts: # pkg/cluster/cluster.go		2017-05-23 10:29:40 +02:00
..
controller.go	Fix error messages (#27)	2017-05-22 14:12:06 +02:00
exec.go	Merge branch 'master' into client-go-3	2017-05-22 14:18:11 +02:00
pod.go	Merge branch 'feature/simplify-pod-events-processing' into client-go-3	2017-05-23 10:29:40 +02:00
postgresql.go	Merge branch 'feature/simplify-pod-events-processing' into client-go-3	2017-05-23 10:29:40 +02:00
util.go	Merge branch 'master' into client-go-3	2017-05-22 14:18:11 +02:00