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/server.h | |
| parent | 5200df6bcb5089ababf679f6bf02de6c3d793e90 (diff) | |
| parent | 7df646667d40390e691616838d35e3e52cdd18c9 (diff) | |
Merge remote-tracking branch 'upstream/master' into bug
Diffstat (limited to 'test/cpp/qps/server.h')
| -rw-r--r-- | test/cpp/qps/server.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 |