diff options
| author |  David G. Quintas <dgq@google.com> | 2018-02-13 10:36:46 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-02-13 10:36:46 -0800 |
| commit | 62a38fd028d8ef5ea9860490a80fb11213de95d1 (patch) | |
| tree | bdcc61f4699d4cd35ffd92c6968ce018d31fe92a /include | |
| parent | 8d1b761296d2230d75a58c655b30d603dfdd351a (diff) | |
| parent | f66cf0d70d113c64a1c3d5a657e08bd7388c8fd6 (diff) | |
Merge pull request #14412 from grpc/revert-14376-revert-14356-revert-13671-grpclb_reresolution
Revert "Revert "Revert "grpclb re-resolution"""
Diffstat (limited to 'include')
| -rw-r--r-- | include/grpc/impl/codegen/grpc_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/grpc/impl/codegen/grpc_types.h b/include/grpc/impl/codegen/grpc_types.h index 3e897b0b27..a372dbba73 100644 --- a/include/grpc/impl/codegen/grpc_types.h +++ b/include/grpc/impl/codegen/grpc_types.h @@ -301,7 +301,7 @@ typedef struct { #define GRPC_ARG_GRPCLB_CALL_TIMEOUT_MS "grpc.grpclb_call_timeout_ms" /* Timeout in milliseconds to wait for the serverlist from the grpclb load balancer before using fallback backend addresses from the resolver. - If 0, fallback will never be used. Default value is 10000. */ + If 0, fallback will never be used. */ #define GRPC_ARG_GRPCLB_FALLBACK_TIMEOUT_MS "grpc.grpclb_fallback_timeout_ms" /** If non-zero, grpc server's cronet compression workaround will be enabled */ #define GRPC_ARG_WORKAROUND_CRONET_COMPRESSION \ |