Will Thames e74a681337 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. (cherry picked from commit 1463c2e4a8)		2018-09-10 09:46:45 -07:00
..
cache
integration	Use a sensible default for k8s merge_type (#45284)	2018-09-10 09:46:45 -07:00
legacy	Backport 2.7 - Select image facts by region (#45297)	2018-09-06 11:35:12 -07:00
results
runner	Remove obsolete default container.	2018-09-05 19:21:06 -07:00
sanity	correct and clarify deprecation (#45234)	2018-09-06 11:36:28 -07:00
units	Skip ipaddr test that fails on Python 3.7+.	2018-09-05 19:21:06 -07:00
utils	Flush output from timing script.	2018-08-31 07:58:12 -07:00