Oleksii Kliukin 0c616a802f Merge branch 'master' into rolling_updates_with_statefulset_annotations ... # Conflicts: # pkg/cluster/k8sres.go		2018-05-15 15:33:34 +02:00
..
apiserver	Merge pull request #240 from zalando-incubator/feature/goreport-improvements	2018-02-22 11:31:08 +01:00
cluster	Merge branch 'master' into rolling_updates_with_statefulset_annotations	2018-05-15 15:33:34 +02:00
controller	Deprecate old LB options, fix endpoint sync. (#287)	2018-05-15 15:19:18 +02:00
spec	Remove the check for the clone cluster name. (#270)	2018-05-03 10:21:37 +02:00
util	Merge branch 'master' into rolling_updates_with_statefulset_annotations	2018-05-15 15:33:34 +02:00