github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages 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
parent fab5fbde7c 9993f1d881
commit f26713f997
1 changed files with 2 additions and 2 deletions
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. // Limit the number of concurrent tests.
maxConcurrency int maxConcurrency int
longTestTimeout = time.Second * 300 longTestTimeout = time.Second * 500
maxTestTimeout = time.Minute * 10 maxTestTimeout = time.Minute * 15
) )
type delegateHandler struct { type delegateHandler struct {