Merge pull request #1550 from jonboulle/bump_timeout

jonboulle · jonboulle · commit 1bb07115f2bc · 2014-10-31T11:05:44.000-07:00
etcdhttp: bump default Server timeout to 5 mins
diff --git a/etcdserver/etcdhttp/http.go b/etcdserver/etcdhttp/http.go
@@ -29,7 +29,7 @@ import (
 
 const (
 	// time to wait for response from EtcdServer requests
-	defaultServerTimeout = 500 * time.Millisecond
+	defaultServerTimeout = 5 * time.Minute
 
 	// time to wait for a Watch request
 	defaultWatchTimeout = 5 * time.Minute
