diff options
| author |  Vijay Pai <vpai@google.com> | 2018-02-08 15:18:13 -0800 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2018-02-08 15:18:13 -0800 |
| commit | 0693b72b7fdf7927ad120319ce53b4cf78cc11c9 (patch) | |
| tree | 9af4eeefbf4e7c98ccd5264eb7280a26f637e18c /src/core/ext/filters/client_channel/subchannel_index.cc | |
| parent | 5122487fad891fdf5560122285c1690a06df73d2 (diff) | |
| parent | bf19c3332161b26f3942ed7b3a711bdc4dd923bc (diff) | |
Merge branch 'master' into gpr_review
Diffstat (limited to 'src/core/ext/filters/client_channel/subchannel_index.cc')
| -rw-r--r-- | src/core/ext/filters/client_channel/subchannel_index.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ext/filters/client_channel/subchannel_index.cc b/src/core/ext/filters/client_channel/subchannel_index.cc index 42647ea325..69dbdccc18 100644 --- a/src/core/ext/filters/client_channel/subchannel_index.cc +++ b/src/core/ext/filters/client_channel/subchannel_index.cc @@ -23,10 +23,10 @@ #include <grpc/support/alloc.h> #include <grpc/support/string_util.h> -#include <grpc/support/tls.h> #include "src/core/lib/avl/avl.h" #include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/gpr/tls.h" // a map of subchannel_key --> subchannel, used for detecting connections // to the same destination in order to share them |