diff options
| author |  ncteisen <ncteisen@gmail.com> | 2018-07-19 11:06:47 -0700 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-07-19 11:06:47 -0700 |
| commit | c4ce804b91cbd824d6e5ed5cc4a8f532355eb414 (patch) | |
| tree | edfa341a1f13821d27f5d02c69e3ccceb86bde40 /src/core/ext/filters/client_channel | |
| parent | d47779bc56f5e15b459a8e26fb642b7b6bb4699a (diff) | |
| parent | 93579e9a773a91316f78a51707f04b3602271db4 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into channelz-grpclb
Diffstat (limited to 'src/core/ext/filters/client_channel')
| -rw-r--r-- | src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc index a19ddd1c0b..fc56a4961f 100644 --- a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc +++ b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc @@ -217,7 +217,7 @@ class RoundRobin : public LoadBalancingPolicy { PickState* pending_picks_ = nullptr; /** our connectivity state tracker */ grpc_connectivity_state_tracker state_tracker_; - /// Lock and data used to capture snapshots of this channels child + /// Lock and data used to capture snapshots of this channel's child /// channels and subchannels. This data is consumed by channelz. gpr_mu child_refs_mu_; ChildRefsList child_subchannels_; |