Merge pull request #22563 from derekwaynecarr/node_e2e

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-05 06:50:56 -08:00
commit 183c188027

View File

@ -30,7 +30,7 @@ import (
"github.com/golang/glog"
)
var serverStartTimeout = flag.Duration("server-start-timeout", time.Second*30, "Time to wait for each server to become healthy.")
var serverStartTimeout = flag.Duration("server-start-timeout", time.Second*120, "Time to wait for each server to become healthy.")
type e2eService struct {
etcdCmd *exec.Cmd