# HG changeset patch # User Sergey Kandaurov # Date 1543322011 -10800 # Node ID 35fd70c12f9834926de61acf353a988ce4b07f45 # Parent 1445fc690c161c29a0c1af02fe606357a78e0c85 Resynchronized the http and stream upstream module versions. diff --git a/xml/en/docs/http/ngx_http_upstream_module.xml b/xml/en/docs/http/ngx_http_upstream_module.xml --- a/xml/en/docs/http/ngx_http_upstream_module.xml +++ b/xml/en/docs/http/ngx_http_upstream_module.xml @@ -461,7 +461,7 @@ Perl library. -If the consistent parameter is specified +If the consistent parameter is specified, the ketama consistent hashing method will be used instead. The method ensures that only a few keys diff --git a/xml/en/docs/stream/ngx_stream_upstream_module.xml b/xml/en/docs/stream/ngx_stream_upstream_module.xml --- a/xml/en/docs/stream/ngx_stream_upstream_module.xml +++ b/xml/en/docs/stream/ngx_stream_upstream_module.xml @@ -409,7 +409,7 @@ This directive is available as part of o Specifies a load balancing method for a server group -where client-server mapping is based on the hashed key value. +where the client-server mapping is based on the hashed key value. The key can contain text, variables, and their combinations (1.11.2). Usage example: @@ -445,8 +445,7 @@ Perl library with the ketama_poin upstream -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