diff options
| author |  Mark D. Roth <roth@google.com> | 2017-03-17 09:53:35 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2017-03-17 09:53:35 -0700 |
| commit | 693d2b48abd180c871aaf7ef0cf9b521d17196f8 (patch) | |
| tree | f37a30384c34b0a43bf3a426ae77529714e83137 /src/python/grpcio | |
| parent | fecba535d99ec2c819a0d26707047bf2f2f323fa (diff) | |
| parent | 01deb9d748db3fc7d04b7d511bec5aec594a8610 (diff) | |
Merge remote-tracking branch 'upstream/master' into retry_throttle
Diffstat (limited to 'src/python/grpcio')
| -rw-r--r-- | src/python/grpcio/grpc_core_dependencies.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index da0dba7dfe..8014a2bb4f 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -33,6 +33,7 @@ CORE_SOURCE_FILES = [ 'src/core/lib/profiling/basic_timers.c', 'src/core/lib/profiling/stap_timers.c', 'src/core/lib/support/alloc.c', + 'src/core/lib/support/arena.c', 'src/core/lib/support/atm.c', 'src/core/lib/support/avl.c', 'src/core/lib/support/backoff.c', |