[2.13] Fix no_proxy generation tasks#6346

Merged

k8s-ci-robot merged 1 commit intokubernetes-sigs:release-2.13from LucasBoisserie:proxy-cherry-pick-2.13

Jul 7, 2020

+4-3

Commits on Jun 30, 2020

Modify the populate no_proxy task to use a combine rather than relying on the hash_behaviour setting to be set to merge rather than replace (#6112 )

codyseavey
authored and
LucasBoisserie
committed