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
..
__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	K8s retry merge (#44821)	2018-08-30 20:42:47 -04:00
scale.py	K8s dynamic collected changes (#40745)	2018-05-30 12:04:48 -05:00