diff options
author | 2017-03-22 10:54:31 -0700 | |
---|---|---|
committer | 2017-03-22 10:54:31 -0700 | |
commit | 937302b0df8d18f0cba94b2fd5f9804a138c0b3a (patch) | |
tree | 671f0b2df4a05551be02580c5b2c6444c0aa5ff3 /config.m4 | |
parent | eb799b78b3b260722a74bfcaa14b43ecaa9341ae (diff) | |
parent | be0dba162edf8a105a0e529f1e70e2b352137d4c (diff) |
Merge remote-tracking branch 'upstream/master' into cares_rebase
Diffstat (limited to 'config.m4')
-rw-r--r-- | config.m4 | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -40,6 +40,7 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/profiling/stap_timers.c \ src/core/lib/support/alloc.c \ src/core/lib/support/arena.c \ + src/core/lib/support/atm.c \ src/core/lib/support/avl.c \ src/core/lib/support/backoff.c \ src/core/lib/support/cmdline.c \ @@ -260,10 +261,8 @@ if test "$PHP_GRPC" != "no"; then src/core/ext/client_channel/client_channel_factory.c \ src/core/ext/client_channel/client_channel_plugin.c \ src/core/ext/client_channel/connector.c \ - src/core/ext/client_channel/default_initial_connect_string.c \ src/core/ext/client_channel/http_connect_handshaker.c \ src/core/ext/client_channel/http_proxy.c \ - src/core/ext/client_channel/initial_connect_string.c \ src/core/ext/client_channel/lb_policy.c \ src/core/ext/client_channel/lb_policy_factory.c \ src/core/ext/client_channel/lb_policy_registry.c \ @@ -273,6 +272,7 @@ if test "$PHP_GRPC" != "no"; then src/core/ext/client_channel/resolver.c \ src/core/ext/client_channel/resolver_factory.c \ src/core/ext/client_channel/resolver_registry.c \ + src/core/ext/client_channel/retry_throttle.c \ src/core/ext/client_channel/subchannel.c \ src/core/ext/client_channel/subchannel_index.c \ src/core/ext/client_channel/uri_parser.c \ |