diff options
| author |  Hongyu Chen <hongyu@google.com> | 2015-08-25 14:44:15 -0700 |
|---|---|---|
| committer | Hongyu Chen <hongyu@google.com> | 2015-08-25 14:44:15 -0700 |
| commit | 011ea49592e71e1db3ef43a094aa9b452ff21e67 (patch) | |
| tree | 70017b24ed2d3736552025680d4a0f138adf456f /tools/doxygen/Doxyfile.core.internal | |
| parent | a96ce800a8df5c62ffd264317836ecf3433c4344 (diff) | |
| parent | 1b481b64be43bd4c7655b25422344a17b2f198d9 (diff) | |
Merge remote-tracking branch 'upstream/master' into timespec
Diffstat (limited to 'tools/doxygen/Doxyfile.core.internal')
| -rw-r--r-- | tools/doxygen/Doxyfile.core.internal | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 97f38057d0..7bd6e41b5c 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -780,7 +780,7 @@ src/core/tsi/fake_transport_security.h \ src/core/tsi/ssl_transport_security.h \ src/core/tsi/transport_security.h \ src/core/tsi/transport_security_interface.h \ -src/core/channel/census_filter.h \ +src/core/census/grpc_filter.h \ src/core/channel/channel_args.h \ src/core/channel/channel_stack.h \ src/core/channel/client_channel.h \ @@ -845,6 +845,12 @@ src/core/json/json_common.h \ src/core/json/json_reader.h \ src/core/json/json_writer.h \ src/core/profiling/timers.h \ +<<<<<<< HEAD +======= +src/core/profiling/timers_preciseclock.h \ +src/core/statistics/census_interface.h \ +src/core/statistics/census_rpc_stats.h \ +>>>>>>> upstream/master src/core/surface/byte_buffer_queue.h \ src/core/surface/call.h \ src/core/surface/channel.h \ @@ -903,6 +909,7 @@ src/core/tsi/fake_transport_security.c \ src/core/tsi/ssl_transport_security.c \ src/core/tsi/transport_security.c \ src/core/census/grpc_context.c \ +src/core/census/grpc_filter.c \ src/core/channel/channel_args.c \ src/core/channel/channel_stack.c \ src/core/channel/client_channel.c \ |