k8s-merge-robot ae28564526 Merge pull request #26386 from janetkuo/etcd-test-flake ...

Automatic merge from submit-queue

Increase etcd test server up timeout and disallow returning nil server 

Fixes #25047

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()

2016-05-27 05:49:51 -07:00

..

etcd

…

etcd3

…

storagebackend

…

testing

…

cacher_test.go

…

cacher.go

…

doc.go

…

errors.go

…

interfaces.go

…

OWNERS

…

util_test.go

…

util.go

…

watch_cache_test.go

…

watch_cache.go

…