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
..
cache	Update ansible-test sanity command. (#31958)	2017-10-26 00:21:46 -07:00
integration	Use a sensible default for k8s merge_type (#45284)	2018-09-08 10:08:09 +10:00
legacy	Select image facts by region (#44965)	2018-09-06 11:57:43 -04:00
results	Collect data from integration test runs. (#28650)	2017-08-25 18:14:47 -04:00
runner	Remove obsolete default container.	2018-09-05 15:29:00 -07:00
sanity	correct and clarify deprecation (#45234)	2018-09-06 13:24:44 -04:00
units	Skip ipaddr test that fails on Python 3.7+.	2018-09-04 09:23:31 -07:00
utils	Flush output from timing script.	2018-08-31 07:58:12 -07:00