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
..
host_vars
targets	K8s retry merge (#44821)	2018-08-30 20:42:47 -04:00
cloud-config-aws.yml.template
cloud-config-azure.yml.template
cloud-config-cs.ini.template
cloud-config-gcp.yml.template
cloud-config-opennebula.yml.template
cloud-config-openshift.kubeconfig.template
cloud-config-tower.cfg.template
integration.cfg
integration_config.yml
inventory
inventory.networking.template
inventory.remote.template
inventory.winrm.template
network-integration.cfg
target-prefixes.network
windows-integration.cfg