Commit Graph

1 Commits (ef8ce6b2f3d19f18c61abb8ae11b6fb061f613f4)

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
7 years ago