diff options
| author |  Bogdan Drutu <bdrutu@google.com> | 2016-01-14 17:57:50 -0800 |
|---|---|---|
| committer | Bogdan Drutu <bdrutu@google.com> | 2016-01-14 17:57:50 -0800 |
| commit | 0277270b3a9ea52c4323cae79cee664a7652c41b (patch) | |
| tree | f3c81cd3b3690328e82cd235681c1a22d88400da /test/cpp/qps | |
| parent | 5200df6bcb5089ababf679f6bf02de6c3d793e90 (diff) | |
| parent | 7df646667d40390e691616838d35e3e52cdd18c9 (diff) | |
Merge remote-tracking branch 'upstream/master' into bug
Diffstat (limited to 'test/cpp/qps')
| -rw-r--r-- | test/cpp/qps/client.h | 2 | ||||
| -rw-r--r-- | test/cpp/qps/client_async.cc | 2 | ||||
| -rw-r--r-- | test/cpp/qps/client_sync.cc | 2 | ||||
| -rw-r--r-- | test/cpp/qps/generic_async_streaming_ping_pong_test.cc | 2 | ||||
| -rw-r--r-- | test/cpp/qps/qps_driver.cc | 2 | ||||
| -rw-r--r-- | test/cpp/qps/qps_worker.cc | 2 | ||||
| -rw-r--r-- | test/cpp/qps/server.h | 2 | ||||
| -rw-r--r-- | test/cpp/qps/server_async.cc | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/test/cpp/qps/client.h b/test/cpp/qps/client.h index 0159f4f1e6..15cfd7a2d7 100644 --- a/test/cpp/qps/client.h +++ b/test/cpp/qps/client.h @@ -377,4 +377,4 @@ std::unique_ptr<Client> CreateGenericAsyncStreamingClient( } // namespace testing } // namespace grpc -#endif
\ No newline at end of file +#endif diff --git a/test/cpp/qps/client_async.cc b/test/cpp/qps/client_async.cc index 3e2317c6d4..f270cd0987 100644 --- a/test/cpp/qps/client_async.cc +++ b/test/cpp/qps/client_async.cc @@ -599,4 +599,4 @@ std::unique_ptr<Client> CreateGenericAsyncStreamingClient( } } // namespace testing -} // namespace grpc
\ No newline at end of file +} // namespace grpc diff --git a/test/cpp/qps/client_sync.cc b/test/cpp/qps/client_sync.cc index 1045915b83..92fbf240ce 100644 --- a/test/cpp/qps/client_sync.cc +++ b/test/cpp/qps/client_sync.cc @@ -172,4 +172,4 @@ std::unique_ptr<Client> CreateSynchronousStreamingClient( } } // namespace testing -} // namespace grpc
\ No newline at end of file +} // namespace grpc diff --git a/test/cpp/qps/generic_async_streaming_ping_pong_test.cc b/test/cpp/qps/generic_async_streaming_ping_pong_test.cc index 7a1275054a..2b2e1c820f 100644 --- a/test/cpp/qps/generic_async_streaming_ping_pong_test.cc +++ b/test/cpp/qps/generic_async_streaming_ping_pong_test.cc @@ -79,4 +79,4 @@ int main(int argc, char** argv) { grpc::testing::RunGenericAsyncStreamingPingPong(); return 0; -}
\ No newline at end of file +} diff --git a/test/cpp/qps/qps_driver.cc b/test/cpp/qps/qps_driver.cc index c70db188d9..eb0a7a5f4e 100644 --- a/test/cpp/qps/qps_driver.cc +++ b/test/cpp/qps/qps_driver.cc @@ -184,4 +184,4 @@ int main(int argc, char** argv) { grpc::testing::QpsDriver(); return 0; -}
\ No newline at end of file +} diff --git a/test/cpp/qps/qps_worker.cc b/test/cpp/qps/qps_worker.cc index e7714c0bb3..bed867e1a4 100644 --- a/test/cpp/qps/qps_worker.cc +++ b/test/cpp/qps/qps_worker.cc @@ -239,4 +239,4 @@ QpsWorker::QpsWorker(int driver_port) { QpsWorker::~QpsWorker() {} } // namespace testing -} // namespace grpc
\ No newline at end of file +} // namespace grpc diff --git a/test/cpp/qps/server.h b/test/cpp/qps/server.h index daee7c3663..32a3e85026 100644 --- a/test/cpp/qps/server.h +++ b/test/cpp/qps/server.h @@ -112,4 +112,4 @@ std::unique_ptr<Server> CreateAsyncServer(const ServerConfig& config); } // namespace testing } // namespace grpc -#endif
\ No newline at end of file +#endif diff --git a/test/cpp/qps/server_async.cc b/test/cpp/qps/server_async.cc index 1ae88d7323..d530dac86b 100644 --- a/test/cpp/qps/server_async.cc +++ b/test/cpp/qps/server_async.cc @@ -397,4 +397,4 @@ std::unique_ptr<Server> CreateAsyncGenericServer(const ServerConfig &config) { } } // namespace testing -} // namespace grpc
\ No newline at end of file +} // namespace grpc |