commit af541d82328e01af0d1cb99097491e48a6d2a601
author Craig Tiller <ctiller@google.com> Wed Sep 28 17:32:09 2016 -0700
committer Craig Tiller <ctiller@google.com> Wed Sep 28 17:32:09 2016 -0700
tree 01b7e481c043aa0a72eeafdd077705b606d2f8aa
parent 1a8c52e47910bc32ed963fd8f56efb00c91883c7

Fix conflicting filename

tools/doxygen/Doxyfile.c++.internal

diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index 3f8df1d..02826d1 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -969,7 +969,7 @@
 src/cpp/client/create_channel_posix.cc \
 src/cpp/client/credentials_cc.cc \
 src/cpp/client/generic_stub.cc \
-src/cpp/common/buffer_pool.cc \
+src/cpp/common/buffer_pool_cc.cc \
 src/cpp/common/channel_arguments.cc \
 src/cpp/common/channel_filter.cc \
 src/cpp/common/completion_queue_cc.cc \

tools/run_tests/sources_and_headers.json

diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index 79a894a..16a5e98 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -6930,7 +6930,7 @@
       "src/cpp/client/create_channel_posix.cc", 
       "src/cpp/client/credentials_cc.cc", 
       "src/cpp/client/generic_stub.cc", 
-      "src/cpp/common/buffer_pool.cc", 
+      "src/cpp/common/buffer_pool_cc.cc", 
       "src/cpp/common/channel_arguments.cc", 
       "src/cpp/common/channel_filter.cc", 
       "src/cpp/common/channel_filter.h",