diff options
author | murgatroid99 <mlumish@google.com> | 2016-09-16 13:44:28 -0700 |
---|---|---|
committer | murgatroid99 <mlumish@google.com> | 2016-09-16 13:44:28 -0700 |
commit | bcc60f75d4b152c4e2eb000bece542f052770bfc (patch) | |
tree | 34806913186d762d45d1014b2ea8c4d4d37188aa /test/cpp/end2end/shutdown_test.cc | |
parent | 232ca0275e9fb82fe7bb25b03fc2402e8c1ee815 (diff) | |
parent | ee43d7bbb11a36c91c6f1ebff6bf3da70b7546b2 (diff) |
Merge branch 'master' into uv_core_transport
Diffstat (limited to 'test/cpp/end2end/shutdown_test.cc')
-rw-r--r-- | test/cpp/end2end/shutdown_test.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/cpp/end2end/shutdown_test.cc b/test/cpp/end2end/shutdown_test.cc index 3f98de6db7..4cba3b1c81 100644 --- a/test/cpp/end2end/shutdown_test.cc +++ b/test/cpp/end2end/shutdown_test.cc @@ -33,6 +33,8 @@ #include <thread> +#include <gtest/gtest.h> + #include <grpc++/channel.h> #include <grpc++/client_context.h> #include <grpc++/create_channel.h> @@ -40,8 +42,8 @@ #include <grpc++/server_builder.h> #include <grpc++/server_context.h> #include <grpc/grpc.h> +#include <grpc/support/log.h> #include <grpc/support/sync.h> -#include <gtest/gtest.h> #include "src/core/lib/support/env.h" #include "src/proto/grpc/testing/echo.grpc.pb.h" |