github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #19137 from gmarek/fix-test

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-01-15 20:38:24 -08:00
commit f26713f997
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/integration/integration.go
View File

@ -75,9 +75,9 @@ var (
// Limit the number of concurrent tests.
maxConcurrency int
longTestTimeout = time.Second * 300
longTestTimeout = time.Second * 500
maxTestTimeout = time.Minute * 10
maxTestTimeout = time.Minute * 15
)
type delegateHandler struct {