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
..
cache
integration	K8s retry merge (#44821)	2018-08-30 20:42:47 -04:00
legacy	scaleway: Introduce scaleway_organization_facts module	2018-08-24 18:15:45 +02:00
results
runner	K8s retry merge (#44821)	2018-08-30 20:42:47 -04:00
sanity	Various updates to macports module (#44605)	2018-08-30 05:03:29 +02:00
units	Gcp auth deprecation (#44866)	2018-08-30 17:14:39 -04:00
utils	List quay.io images during Shippable run.	2018-08-29 18:04:22 -07:00