diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-05-18 11:00:31 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-05-18 11:00:31 -0700 |
| commit | d013e9b98538710680ced4c3241ab60df9a66190 (patch) | |
| tree | 637bae50948c98235f08db0a89cb2ac6008ea1ac /src/core/ext/lb_policy/grpclb/load_balancer_api.h | |
| parent | 604490973b219aa69ee67c252173fa60cadb24b1 (diff) | |
| parent | fcbe7daf832dcb616fc93ca59c3b1aab279f510e (diff) | |
Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation
Diffstat (limited to 'src/core/ext/lb_policy/grpclb/load_balancer_api.h')
| -rw-r--r-- | src/core/ext/lb_policy/grpclb/load_balancer_api.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/ext/lb_policy/grpclb/load_balancer_api.h b/src/core/ext/lb_policy/grpclb/load_balancer_api.h index 968f7d278a..71b5616d0c 100644 --- a/src/core/ext/lb_policy/grpclb/load_balancer_api.h +++ b/src/core/ext/lb_policy/grpclb/load_balancer_api.h @@ -37,7 +37,7 @@ #include <grpc/support/slice_buffer.h> #include "src/core/ext/client_config/lb_policy_factory.h" -#include "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h" +#include "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h" #ifdef __cplusplus extern "C" { @@ -45,10 +45,10 @@ extern "C" { #define GRPC_GRPCLB_SERVICE_NAME_MAX_LENGTH 128 -typedef grpc_lb_v0_LoadBalanceRequest grpc_grpclb_request; -typedef grpc_lb_v0_LoadBalanceResponse grpc_grpclb_response; -typedef grpc_lb_v0_Server grpc_grpclb_server; -typedef grpc_lb_v0_Duration grpc_grpclb_duration; +typedef grpc_lb_v1_LoadBalanceRequest grpc_grpclb_request; +typedef grpc_lb_v1_LoadBalanceResponse grpc_grpclb_response; +typedef grpc_lb_v1_Server grpc_grpclb_server; +typedef grpc_lb_v1_Duration grpc_grpclb_duration; typedef struct grpc_grpclb_serverlist { grpc_grpclb_server **servers; size_t num_servers; |