diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-02-23 00:44:41 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-02-23 00:44:41 +0100 |
| commit | 1dda9926973247a646bca4d0d837cbe04f1ecc82 (patch) | |
| tree | 522865d5587a2f5efd3978c35bc22c0721ccce66 /src/python | |
| parent | 1280fdb5741f459fbec6a8c73a92d1c4ada34849 (diff) | |
| parent | bfc7adaa714b5d8a3b0dca4a25d572dbd92039be (diff) | |
Merge branch 'master' into backport-merge
Diffstat (limited to 'src/python')
| -rw-r--r-- | src/python/grpcio/grpc_core_dependencies.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index f43ac5c0a5..a002a5a0a8 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -224,7 +224,7 @@ CORE_SOURCE_FILES = [ 'src/core/tsi/transport_security.c', 'src/core/census/context.c', 'src/core/census/initialize.c', - 'src/core/census/log.c', + 'src/core/census/mlog.c', 'src/core/census/operation.c', 'src/core/census/placeholders.c', 'src/core/census/tracing.c', |