restore ability to run against secured etcd#21535

Merged

bgrant0607 merged 1 commit intokubernetes:masterfrom adohe-zz:restore_secure_etcd

Mar 11, 2016

+270-83

Commits on Mar 11, 2016

restore ability to run against secured etcd
adohe
committed