diff options
| author |  Mark D. Roth <roth@google.com> | 2016-08-02 14:58:36 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-08-02 14:58:36 -0700 |
| commit | 34befcaa20699eb9fe3e26be1ec6fcaa57d333ad (patch) | |
| tree | 0647157b56ce147f78de855c2afd1b6896be1368 /src/python | |
| parent | 51c7b917d31e79a42284298afb5b8cdf35a96a16 (diff) | |
| parent | 5c3877e70f97e12242326fe628a2ced2d97995be (diff) | |
Merge remote-tracking branch 'upstream/master' into http_connect
Diffstat (limited to 'src/python')
| -rw-r--r-- | src/python/grpcio/grpc_core_dependencies.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index a029005753..969e7b0920 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -253,6 +253,7 @@ CORE_SOURCE_FILES = [ 'src/core/ext/resolver/sockaddr/sockaddr_resolver.c', 'src/core/ext/load_reporting/load_reporting.c', 'src/core/ext/load_reporting/load_reporting_filter.c', + 'src/core/ext/census/base_resources.c', 'src/core/ext/census/context.c', 'src/core/ext/census/gen/census.pb.c', 'src/core/ext/census/grpc_context.c', @@ -262,6 +263,7 @@ CORE_SOURCE_FILES = [ 'src/core/ext/census/mlog.c', 'src/core/ext/census/operation.c', 'src/core/ext/census/placeholders.c', + 'src/core/ext/census/resource.c', 'src/core/ext/census/tracing.c', 'src/core/plugin_registry/grpc_plugin_registry.c', 'src/boringssl/err_data.c', |