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
..
k8s	K8s retry merge (#44821)	2018-08-30 20:42:47 -04:00
openshift	K8s dynamic collected changes (#40745)	2018-05-30 12:04:48 -05:00
__init__.py	Relocating extras into lib/ansible/modules/ after merge	2016-12-08 11:35:18 -05:00
consul.py	Prefer readthedocs.io instead of readthedocs.org for doc links (#41537)	2018-06-18 08:22:50 -04:00
consul_acl.py	Prefer readthedocs.io instead of readthedocs.org for doc links (#41537)	2018-06-18 08:22:50 -04:00
consul_kv.py	Prefer readthedocs.io instead of readthedocs.org for doc links (#41537)	2018-06-18 08:22:50 -04:00
consul_session.py	Prefer readthedocs.io instead of readthedocs.org for doc links (#41537)	2018-06-18 08:22:50 -04:00
etcd3.py	Surround top-level function and class definitions with two blank lines.	2018-07-31 12:06:56 -07:00
pacemaker_cluster.py	pacemaker_cluster: PEP8 compliancy and doc changes (#33001)	2017-11-17 20:34:29 +01:00
znode.py	Fix shebangs and file modes and update tests. (#40563)	2018-05-22 14:25:36 -07:00