internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 22:02:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

K8s retry merge (#44821)

Browse Source 
* 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
This commit is contained in:
Will Thames
2018-08-31 10:42:47 +10:00
committed by ansibot
parent ac3781d40b
commit ce110ff081
6 changed files with 433 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/runner/requirements/constraints.txt
View File

@@ -17,3 +17,4 @@ ntlm-auth >= 1.0.6 # message encryption support
requests-ntlm >= 1.1.0 # message encryption support
requests-credssp >= 0.1.0 # message encryption support
voluptuous >= 0.11.0 # Schema recursion via Self
openshift >= 0.6.2 # merge_type support