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/end2end/thread_stress_test.cc | |
| parent | 5200df6bcb5089ababf679f6bf02de6c3d793e90 (diff) | |
| parent | 7df646667d40390e691616838d35e3e52cdd18c9 (diff) | |
Merge remote-tracking branch 'upstream/master' into bug
Diffstat (limited to 'test/cpp/end2end/thread_stress_test.cc')
| -rw-r--r-- | test/cpp/end2end/thread_stress_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/cpp/end2end/thread_stress_test.cc b/test/cpp/end2end/thread_stress_test.cc index 592c427d5d..4e8860e843 100644 --- a/test/cpp/end2end/thread_stress_test.cc +++ b/test/cpp/end2end/thread_stress_test.cc @@ -234,4 +234,4 @@ int main(int argc, char** argv) { grpc_test_init(argc, argv); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); -}
\ No newline at end of file +} |