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
..
playbooks	Use a sensible default for k8s merge_type (#45284)	2018-09-10 09:46:45 -07:00
aliases	Revert "Disabled failing k8s integration test."	2018-08-17 13:26:45 -07:00
runme.sh	Use a sensible default for k8s merge_type (#45284)	2018-09-10 09:46:45 -07:00