diff options
| author |  Alistair Veitch <aveitch@google.com> | 2015-07-30 14:38:00 -0700 |
|---|---|---|
| committer | Alistair Veitch <aveitch@google.com> | 2015-07-30 14:38:00 -0700 |
| commit | 1178900c04556a3d59d789d3ecd84ea6a20548fc (patch) | |
| tree | 72c8aaebb356b6d456f824774fb4cb1316dac6f5 /src | |
| parent | 6796805897b927a8d02eb80096c632303a97caa3 (diff) | |
merge with master, fix build issue
Diffstat (limited to 'src')
| -rw-r--r-- | src/cpp/server/server_context.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/cpp/server/server_context.cc b/src/cpp/server/server_context.cc index f54ed8aa29..f6c073040b 100644 --- a/src/cpp/server/server_context.cc +++ b/src/cpp/server/server_context.cc @@ -39,7 +39,6 @@ #include <grpc++/impl/sync.h> #include <grpc++/time.h> -#include "src/core/census/grpc_context.h" #include "src/core/channel/compress_filter.h" #include "src/cpp/common/create_auth_context.h" |