1 Commits (107ae1a4f38e6793da0eb254d90830703a05d8f2)

Author	SHA1	Message	Date
Will Thames	ce110ff081	K8s retry merge (#44821) ... * Make merge_type a list and apply merge_type in order Allow use case of preferring strategic-merge and failing back to merge, or just preferring a different merge type * Improve k8s module test coverage	2018-08-30 20:42:47 -04:00