diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-03-28 17:03:38 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-03-28 17:03:38 -0700 |
| commit | b3b724971f7ed3d97027ca22f46fb9521a6c2043 (patch) | |
| tree | 9c2acc3bb60f5bcd13b049c5f63a26d2d470abb0 /test/cpp/interop/interop_client.h | |
| parent | 1809bba1ca7332836a20d8e3f8222b18d594b688 (diff) | |
| parent | 9a0f14ba9959ac0cbf672282f8376b4e4e3b14dc (diff) | |
Merge branch 'master' of github.com:grpc/grpc into sockaddr_resolver_lb
Diffstat (limited to 'test/cpp/interop/interop_client.h')
| -rw-r--r-- | test/cpp/interop/interop_client.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/cpp/interop/interop_client.h b/test/cpp/interop/interop_client.h index 3f57f3c733..e6706b5713 100644 --- a/test/cpp/interop/interop_client.h +++ b/test/cpp/interop/interop_client.h @@ -36,8 +36,8 @@ #include <memory> -#include <grpc/grpc.h> #include <grpc++/channel.h> +#include <grpc/grpc.h> #include "src/proto/grpc/testing/messages.grpc.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h" |