ce110ff081
* 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 |
||
---|---|---|
.. | ||
completion | ||
docker | ||
injector | ||
lib | ||
requirements | ||
setup | ||
units | ||
.dockerignore | ||
ansible-test | ||
Dockerfile | ||
Makefile | ||
retry.py | ||
shippable.py | ||
test.py | ||
tox.ini |