# HG changeset patch
# User Thibault Charbonnier <thibaultcha@fastmail.com>
# Date 1485309159 28800
# Node ID a1ec33df7ce0c8d4e339e4fc42ddf2b76bae2f09
# Parent  7113b9b2dd6cc5225f608479b667ae6cfbc61810
Upstream: removed unused ngx_http_upstream_conf_t.timeout field.

diff -r 7113b9b2dd6c -r a1ec33df7ce0 src/http/ngx_http_upstream.h
--- a/src/http/ngx_http_upstream.h	Wed Jan 25 15:39:22 2017 +0300
+++ b/src/http/ngx_http_upstream.h	Tue Jan 24 17:52:39 2017 -0800
@@ -151,7 +151,6 @@
     ngx_msec_t                       connect_timeout;
     ngx_msec_t                       send_timeout;
     ngx_msec_t                       read_timeout;
-    ngx_msec_t                       timeout;
     ngx_msec_t                       next_upstream_timeout;
 
     size_t                           send_lowat;