Merge pull request #934 from smarterclayton/make_timeout_longer

Make global http timeout longer than most operations

cmd/apiserver/apiserver.go

@@ -113,8 +113,8 @@ func main() {
 	s := &http.Server{
 		Addr:           net.JoinHostPort(*address, strconv.Itoa(int(*port))),
 		Handler:        apiserver.Handle(storage, codec, *apiPrefix),
-		ReadTimeout:    10 * time.Second,
-		WriteTimeout:   10 * time.Second,
+		ReadTimeout:    5 * time.Minute,
+		WriteTimeout:   5 * time.Minute,
 		MaxHeaderBytes: 1 << 20,
 	}
 	glog.Fatal(s.ListenAndServe())