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
..
__init__.py	Reorganize k8s common (#34212)	2017-12-23 16:41:38 -05:00
common.py	Change the return key of k8s_facts (#44446)	2018-08-29 12:04:04 +01:00
inventory.py	Several kubectl fixes (#40882)	2018-07-12 09:06:26 +10:00
raw.py	Use a sensible default for k8s merge_type (#45284)	2018-09-08 10:08:09 +10:00
scale.py	K8s dynamic collected changes (#40745)	2018-05-30 12:04:48 -05:00