Fix strategic merge diff list diff bug#26418

Merged

k8s-github-robot merged 1 commit intokubernetes:masterfrom adohe-zz:kubectl_env

May 30, 2016

+1-1

Commits on May 27, 2016

fix strategy patch diff list issue
adohe
committed