Will Thames 1463c2e4a8 Use a sensible default for k8s merge_type (#45284) ... * Use a sensible default for k8s merge_type The sensible default for merge_type is `['strategic-merge', 'merge']. However, we can't make this the default default, as we need to support users who are using openshift 0.6.0, where the merge_type parameter is unsupported. * Refactor k8s test suite for merge_type tests Allow tests with pre-merge-type openshift and post-merge-type openshift.		2018-09-08 10:08:09 +10:00
..
host_vars
targets	Use a sensible default for k8s merge_type (#45284)	2018-09-08 10:08:09 +10: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	opennebula: new module one_host (#40041)	2018-05-17 10:10:49 +02:00
cloud-config-openshift.kubeconfig.template
cloud-config-tower.cfg.template	Initial Tower module integration test support.	2018-03-07 14:21:55 -08:00
integration.cfg
integration_config.yml
inventory	Use the computed role name instead of 'role'. Fixes #38838 (#39516)	2018-04-30 14:41:13 -05:00
inventory.networking.template
inventory.remote.template
inventory.winrm.template
network-integration.cfg	increase timeout for connection reset by peer issue with httpapi (#41224)	2018-06-07 12:46:51 +05:30
target-prefixes.network	Add cnos to network target prefixes.	2018-05-17 16:26:55 -07:00
windows-integration.cfg