diff options
| author |  Siddharth Rakesh <sidrakesh@google.com> | 2015-06-29 13:27:23 -0700 |
|---|---|---|
| committer | Siddharth Rakesh <sidrakesh@google.com> | 2015-06-29 13:27:23 -0700 |
| commit | 25481f72c1d519136b7fdd13f906f6ecaa9ee268 (patch) | |
| tree | ec4131317df4aca8b7f59e67c8b22f168307a949 /tools/run_tests | |
| parent | 872e8187c20a7142736f95d41d8b005c6ef31bda (diff) | |
Resolving merge conflict
Diffstat (limited to 'tools/run_tests')
| -rw-r--r-- | tools/run_tests/sources_and_headers.json | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index eb2514fa46..13d77d571b 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -9779,6 +9779,8 @@ "test/cpp/qps/driver.h", "test/cpp/qps/histogram.h", "test/cpp/qps/interarrival.h", + "test/cpp/qps/perf_db.grpc.pb.h", + "test/cpp/qps/perf_db.pb.h", "test/cpp/qps/qps_worker.h", "test/cpp/qps/qpstest.grpc.pb.h", "test/cpp/qps/qpstest.pb.h", @@ -9798,6 +9800,7 @@ "test/cpp/qps/driver.h", "test/cpp/qps/histogram.h", "test/cpp/qps/interarrival.h", + "test/cpp/qps/perf_db_client.cc", "test/cpp/qps/qps_worker.cc", "test/cpp/qps/qps_worker.h", "test/cpp/qps/report.cc", |