diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-16 10:14:18 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-16 10:14:18 -0700 |
| commit | ee5173f7cb23b30f73afffb0ee6d50515bed0169 (patch) | |
| tree | a80dee5909c6c3007de4fa59af97f718d9e2d4d2 /include/grpc++/impl/codegen/sync_stream.h | |
| parent | 1621c26c1ec49207e994e4b11671fb8fb38225ba (diff) | |
| parent | 2b626466af11eed576859499baecf8c807591912 (diff) | |
Merge branch 'grpclb_resolver_changes' into grpclb_resolver_changes2
Diffstat (limited to 'include/grpc++/impl/codegen/sync_stream.h')
| -rw-r--r-- | include/grpc++/impl/codegen/sync_stream.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/grpc++/impl/codegen/sync_stream.h b/include/grpc++/impl/codegen/sync_stream.h index e1d4660ae7..aba129811b 100644 --- a/include/grpc++/impl/codegen/sync_stream.h +++ b/include/grpc++/impl/codegen/sync_stream.h @@ -42,7 +42,6 @@ #include <grpc++/impl/codegen/server_context.h> #include <grpc++/impl/codegen/service_type.h> #include <grpc++/impl/codegen/status.h> -#include <grpc/impl/codegen/log.h> namespace grpc { |