aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/doxygen
diff options
context:
space:
mode:
authorGravatar Alistair Veitch <aveitch@google.com>2015-08-04 17:47:11 -0700
committerGravatar Alistair Veitch <aveitch@google.com>2015-08-04 17:47:11 -0700
commita924b31d28ad907ebc040dd63945356011f613f6 (patch)
tree460ca81d36aa93cb9efdedf971cc29a7cc7a59db /tools/doxygen
parent0383d494c4fd0c97a113359348d5136b641c789f (diff)
parent80aecf609b54aeb0677461cae771362b5affe173 (diff)
merge with upstream/master
Diffstat (limited to 'tools/doxygen')
-rw-r--r--tools/doxygen/Doxyfile.core.internal6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index e2c206cfd2..e5bf7fa220 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -784,7 +784,6 @@ 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/census/grpc_context.h \
src/core/channel/census_filter.h \
src/core/channel/channel_args.h \
src/core/channel/channel_stack.h \
@@ -806,6 +805,8 @@ src/core/client_config/resolvers/dns_resolver.h \
src/core/client_config/resolvers/sockaddr_resolver.h \
src/core/client_config/subchannel.h \
src/core/client_config/subchannel_factory.h \
+src/core/client_config/subchannel_factory_decorators/add_channel_arg.h \
+src/core/client_config/subchannel_factory_decorators/merge_channel_args.h \
src/core/client_config/uri_parser.h \
src/core/compression/message_compress.h \
src/core/debug/trace.h \
@@ -926,6 +927,8 @@ src/core/client_config/resolvers/dns_resolver.c \
src/core/client_config/resolvers/sockaddr_resolver.c \
src/core/client_config/subchannel.c \
src/core/client_config/subchannel_factory.c \
+src/core/client_config/subchannel_factory_decorators/add_channel_arg.c \
+src/core/client_config/subchannel_factory_decorators/merge_channel_args.c \
src/core/client_config/uri_parser.c \
src/core/compression/algorithm.c \
src/core/compression/message_compress.c \
@@ -978,6 +981,7 @@ src/core/surface/call.c \
src/core/surface/call_details.c \
src/core/surface/call_log_batch.c \
src/core/surface/channel.c \
+src/core/surface/channel_connectivity.c \
src/core/surface/channel_create.c \
src/core/surface/completion_queue.c \
src/core/surface/event_string.c \