diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-03-26 13:19:07 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-03-26 13:19:07 -0700 |
| commit | 92b3f568dbd1bf15c85cddac8d8f57a5a58201ef (patch) | |
| tree | 57cbb547c3e2feee2737df86382b422d37ebb3c0 /test/cpp/interop/client_helper.cc | |
| parent | c63a09eb6ceb547c73b674f48a5833412cd5f08f (diff) | |
| parent | 94f908ae84ab6d280a41e09245925ecfa612dce8 (diff) | |
Merge github.com:grpc/grpc into fuzzy-bits
Diffstat (limited to 'test/cpp/interop/client_helper.cc')
| -rw-r--r-- | test/cpp/interop/client_helper.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/cpp/interop/client_helper.cc b/test/cpp/interop/client_helper.cc index 5caf0f2d1d..029b967801 100644 --- a/test/cpp/interop/client_helper.cc +++ b/test/cpp/interop/client_helper.cc @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -39,13 +39,13 @@ #include <memory> #include <sstream> -#include <grpc/grpc.h> -#include <grpc/support/alloc.h> -#include <grpc/support/log.h> #include <gflags/gflags.h> #include <grpc++/channel.h> #include <grpc++/create_channel.h> #include <grpc++/security/credentials.h> +#include <grpc/grpc.h> +#include <grpc/support/alloc.h> +#include <grpc/support/log.h> #include "src/cpp/client/secure_credentials.h" #include "test/core/security/oauth2_utils.h" |