Set etcd DialTimeout, fix etcd start order in all-in-one#19953

Merged

openshift-merge-robot merged 2 commits intoopenshift:masterfrom

liggitt:etcd-dial-timeout

Jun 10, 2018

Commits on Jun 9, 2018

UPSTREAM: 61459: etcd client add dial timeout

hzxuzhonghu
authored and
liggitt
committed

Commits on Jun 10, 2018

Hoist etcd startup first for all-in-one
liggitt
committed