diff options
author | 2016-03-30 17:12:29 -0700 | |
---|---|---|
committer | 2016-03-30 17:12:29 -0700 | |
commit | 076c2b807b6417714dac026e77184be032fdc5b1 (patch) | |
tree | 5202e61a72b9fd7e39f73cf43e39a4d4520edebf /test/cpp/interop/reconnect_interop_client.cc | |
parent | 24e69bf02afb0f4abdd637d1513e93e5aa227e7e (diff) | |
parent | a5dc80d22ae03f76525f030fb1bfd47c0d8266a2 (diff) |
Merge github.com:grpc/grpc into channel_max_reconnect_backoff
Diffstat (limited to 'test/cpp/interop/reconnect_interop_client.cc')
-rw-r--r-- | test/cpp/interop/reconnect_interop_client.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/cpp/interop/reconnect_interop_client.cc b/test/cpp/interop/reconnect_interop_client.cc index fd0144f876..87e82a1fc5 100644 --- a/test/cpp/interop/reconnect_interop_client.cc +++ b/test/cpp/interop/reconnect_interop_client.cc @@ -34,17 +34,17 @@ #include <memory> #include <sstream> -#include <grpc/grpc.h> -#include <grpc/support/log.h> #include <gflags/gflags.h> #include <grpc++/channel.h> #include <grpc++/client_context.h> #include <grpc++/support/channel_arguments.h> -#include "test/cpp/util/create_test_channel.h" -#include "test/cpp/util/test_config.h" -#include "src/proto/grpc/testing/test.grpc.pb.h" +#include <grpc/grpc.h> +#include <grpc/support/log.h> #include "src/proto/grpc/testing/empty.grpc.pb.h" #include "src/proto/grpc/testing/messages.grpc.pb.h" +#include "src/proto/grpc/testing/test.grpc.pb.h" +#include "test/cpp/util/create_test_channel.h" +#include "test/cpp/util/test_config.h" DEFINE_int32(server_control_port, 0, "Server port for control rpcs."); DEFINE_int32(server_retry_port, 0, "Server port for testing reconnection."); |