diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-02-22 23:15:28 -0800 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-02-22 23:15:28 -0800 |
| commit | 45add8a445d426959634e172f195c57c56c4ca3d (patch) | |
| tree | eef39567b46b94ae21723961c8ff1980db88dbaf /tools/run_tests | |
| parent | 0160873273be3fb502f05d4349e074422f4addcb (diff) | |
| parent | 27b3f776da80da9d74e9c6a43d6794c86ba0cfb3 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into alarm_cpp
Diffstat (limited to 'tools/run_tests')
| -rw-r--r-- | tools/run_tests/sources_and_headers.json | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index e44a7bc79e..8666a36c9e 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -4132,7 +4132,6 @@ "src/cpp/client/secure_credentials.cc", "src/cpp/client/secure_credentials.h", "src/cpp/codegen/grpc_library.cc", - "src/cpp/common/alarm.cc", "src/cpp/common/auth_property_iterator.cc", "src/cpp/common/call.cc", "src/cpp/common/channel_arguments.cc", @@ -4385,7 +4384,6 @@ "src/cpp/client/generic_stub.cc", "src/cpp/client/insecure_credentials.cc", "src/cpp/codegen/grpc_library.cc", - "src/cpp/common/alarm.cc", "src/cpp/common/call.cc", "src/cpp/common/channel_arguments.cc", "src/cpp/common/completion_queue.cc", |