aboutsummaryrefslogtreecommitdiffhomepage
path: root/doc
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2017-10-12 09:08:41 -0700
committerGravatar Craig Tiller <ctiller@google.com>2017-10-12 09:08:41 -0700
commitbf0bdfb05057bf74aa27cff382f7ed2fe1d10d2a (patch)
tree6508a44a9fb4835309650c2c0b2cf89fbfa9a491 /doc
parent79c4f1fb141762272d72eea5f3a5c39bb3bb0043 (diff)
parentd7b198be47b5723bc198d25c5ce56f82e12fa97f (diff)
Merge github.com:grpc/grpc into epexinf
Diffstat (limited to 'doc')
-rw-r--r--doc/load-balancing.md7
1 files changed, 3 insertions, 4 deletions
diff --git a/doc/load-balancing.md b/doc/load-balancing.md
index 88ff35496f..8ff94075b5 100644
--- a/doc/load-balancing.md
+++ b/doc/load-balancing.md
@@ -129,10 +129,9 @@ works:
by the resolver. It asks the balancer for the server addresses to
use for the server name originally requested by the client (i.e.,
the same one originally passed to the name resolver).
- - Note: The `grpclb` policy currently ignores any non-balancer
- addresses returned by the resolver. However, in the future, it
- may be changed to use these addresses as a fallback in case no
- balancers can be contacted.
+ - Note: In the `grpclb` policy, the non-balancer addresses returned
+ by the resolver are used as a fallback in case no balancers can be
+ contacted when the LB policy is started.
2. The gRPC servers to which the load balancer is directing the client
may report load to the load balancers, if that information is needed
by the load balancer's configuration.