Commit Graph

1 Commits (f465a251e1c11b21b0b0f40d8dfb68cd3d2593a7)

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