diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2017-04-01 17:36:15 -0700 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2017-04-01 17:36:15 -0700 |
| commit | c1a32fa46e2c4e0a9990c66445c3079cf47d7c62 (patch) | |
| tree | 764f4926dbae4420ba8b0be2fe1484bc092902f1 /src/python | |
| parent | 4426800e6c3b8e1c535918166a1e59fea521bfd7 (diff) | |
| parent | bd210c0bff6c8e52f49caa1cbc129359c24e2fbf (diff) | |
Merge branch 'master' into cq_create_api_changes
Diffstat (limited to 'src/python')
| -rw-r--r-- | src/python/grpcio/grpc_core_dependencies.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 970c70bb1b..ed8793b019 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -88,6 +88,7 @@ CORE_SOURCE_FILES = [ 'src/core/lib/channel/handshaker_registry.c', 'src/core/lib/channel/http_client_filter.c', 'src/core/lib/channel/http_server_filter.c', + 'src/core/lib/channel/max_age_filter.c', 'src/core/lib/channel/message_size_filter.c', 'src/core/lib/compression/compression.c', 'src/core/lib/compression/message_compress.c', @@ -162,7 +163,7 @@ CORE_SOURCE_FILES = [ 'src/core/lib/json/json_reader.c', 'src/core/lib/json/json_string.c', 'src/core/lib/json/json_writer.c', - 'src/core/lib/security/util/b64.c', + 'src/core/lib/slice/b64.c', 'src/core/lib/slice/percent_encoding.c', 'src/core/lib/slice/slice.c', 'src/core/lib/slice/slice_buffer.c', |