diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-10-06 13:16:08 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-10-06 13:16:08 -0700 |
| commit | e08e39d14811c51334151ca43b40764a70380e23 (patch) | |
| tree | 2b14caea98ad852fc37cc6cd391e3546ac98d014 /tools | |
| parent | a69912cb2c7abae2d930c4158bd56c33b9b7b898 (diff) | |
| parent | 3640b4084ac8485ef99ab3162cae7b8b079bbf6b (diff) | |
Merge github.com:grpc/grpc into qps_failya
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/doxygen/Doxyfile.core.internal | 2 | ||||
| -rw-r--r-- | tools/run_tests/generated/sources_and_headers.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 37dc9b4ba5..d4654034f2 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -1056,7 +1056,7 @@ src/core/ext/transport/inproc/inproc_plugin.cc \ src/core/ext/transport/inproc/inproc_transport.cc \ src/core/ext/transport/inproc/inproc_transport.h \ src/core/lib/README.md \ -src/core/lib/backoff/backoff.c \ +src/core/lib/backoff/backoff.cc \ src/core/lib/backoff/backoff.h \ src/core/lib/channel/README.md \ src/core/lib/channel/channel_args.cc \ diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json index 8b11bb742e..babdfeb685 100644 --- a/tools/run_tests/generated/sources_and_headers.json +++ b/tools/run_tests/generated/sources_and_headers.json @@ -7994,7 +7994,7 @@ "language": "c", "name": "grpc_base", "src": [ - "src/core/lib/backoff/backoff.c", + "src/core/lib/backoff/backoff.cc", "src/core/lib/channel/channel_args.cc", "src/core/lib/channel/channel_stack.cc", "src/core/lib/channel/channel_stack_builder.cc", |