diff options
| author |  David Garcia Quintas <dgq@google.com> | 2018-03-21 17:10:15 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2018-03-21 17:10:15 -0700 |
| commit | 0abc077d45e0493077eef2351789db17c5d07a16 (patch) | |
| tree | fada31dce5346ef307bf4d56194f59fbe25b823c /config.m4 | |
| parent | a10634cadc5562c660724084ebc8c4baa1532fbf (diff) | |
| parent | dc93b71e536d72d2a9adfe63467133b799005c08 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into authority_header
Diffstat (limited to 'config.m4')
| -rw-r--r-- | config.m4 | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -84,10 +84,13 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/channel/channel_args.cc \ src/core/lib/channel/channel_stack.cc \ src/core/lib/channel/channel_stack_builder.cc \ + src/core/lib/channel/channel_trace.cc \ + src/core/lib/channel/channel_trace_registry.cc \ src/core/lib/channel/connected_channel.cc \ src/core/lib/channel/handshaker.cc \ src/core/lib/channel/handshaker_factory.cc \ src/core/lib/channel/handshaker_registry.cc \ + src/core/lib/channel/status_util.cc \ src/core/lib/compression/compression.cc \ src/core/lib/compression/compression_internal.cc \ src/core/lib/compression/message_compress.cc \ @@ -336,7 +339,6 @@ if test "$PHP_GRPC" != "no"; then src/core/ext/filters/client_channel/resolver.cc \ src/core/ext/filters/client_channel/resolver_registry.cc \ src/core/ext/filters/client_channel/retry_throttle.cc \ - src/core/ext/filters/client_channel/status_util.cc \ src/core/ext/filters/client_channel/subchannel.cc \ src/core/ext/filters/client_channel/subchannel_index.cc \ src/core/ext/filters/client_channel/uri_parser.cc \ |