Mercurial > hg > nginx-site
changeset 2282:35fd70c12f98
Resynchronized the http and stream upstream module versions.
author | Sergey Kandaurov <pluknet@nginx.com> |
---|---|
date | Tue, 27 Nov 2018 15:33:31 +0300 |
parents | 1445fc690c16 |
children | 81e2cd93a2ce |
files | xml/en/docs/http/ngx_http_upstream_module.xml xml/en/docs/stream/ngx_stream_upstream_module.xml |
diffstat | 2 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_upstream_module.xml Tue Nov 27 15:11:03 2018 +0300 +++ b/xml/en/docs/http/ngx_http_upstream_module.xml Tue Nov 27 15:33:31 2018 +0300 @@ -461,7 +461,7 @@ </para> <para> -If the <literal>consistent</literal> parameter is specified +If the <literal>consistent</literal> parameter is specified, the <link url="https://www.metabrew.com/article/libketama-consistent-hashing-algo-memcached-clients">ketama</link> consistent hashing method will be used instead. The method ensures that only a few keys
--- a/xml/en/docs/stream/ngx_stream_upstream_module.xml Tue Nov 27 15:11:03 2018 +0300 +++ b/xml/en/docs/stream/ngx_stream_upstream_module.xml Tue Nov 27 15:33:31 2018 +0300 @@ -409,7 +409,7 @@ <para> Specifies a load balancing method for a server group -where client-server mapping is based on the hashed <value>key</value> value. +where the client-server mapping is based on the hashed <value>key</value> value. The <value>key</value> can contain text, variables, and their combinations (1.11.2). Usage example: @@ -445,8 +445,7 @@ <context>upstream</context> <para> -Specifies that a server group should use a load balancing method -where a connection +Specifies that a group should use a load balancing method where a connection is passed to the server with the least number of active connections, taking into account weights of servers. If there are several such servers, they are tried in turn using a