diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-03-20 09:12:16 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-03-20 09:12:16 -0700 |
| commit | de7edf83ccef1bd95186b059d55266e45db449ba (patch) | |
| tree | 4a4a8976beec2f30b106f79f498cb07e0cbbf4d7 /src/python/grpcio | |
| parent | 3ab6f4dc11a4936463a5588b105aad14f5a78a40 (diff) | |
| parent | cb1c389a6c98d72e59fe10e07f4c15156abf62a1 (diff) | |
Merge github.com:grpc/grpc into backoff2
Reintroduce flakiness flag for tests: lb_policies_test is inherently flaky and I don't have time to deflake this week
Diffstat (limited to 'src/python/grpcio')
| -rw-r--r-- | src/python/grpcio/grpc/_cython/imports.generated.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/python/grpcio/grpc/_cython/imports.generated.h b/src/python/grpcio/grpc/_cython/imports.generated.h index b70dcccd17..4d18369e1f 100644 --- a/src/python/grpcio/grpc/_cython/imports.generated.h +++ b/src/python/grpcio/grpc/_cython/imports.generated.h @@ -166,7 +166,7 @@ extern grpc_compression_algorithm_parse_type grpc_compression_algorithm_parse_im typedef int(*grpc_compression_algorithm_name_type)(grpc_compression_algorithm algorithm, char **name); extern grpc_compression_algorithm_name_type grpc_compression_algorithm_name_import; #define grpc_compression_algorithm_name grpc_compression_algorithm_name_import -typedef grpc_compression_algorithm(*grpc_compression_algorithm_for_level_type)(grpc_compression_level level); +typedef grpc_compression_algorithm(*grpc_compression_algorithm_for_level_type)(grpc_compression_level level, uint32_t accepted_encodings); extern grpc_compression_algorithm_for_level_type grpc_compression_algorithm_for_level_import; #define grpc_compression_algorithm_for_level grpc_compression_algorithm_for_level_import typedef void(*grpc_compression_options_init_type)(grpc_compression_options *opts); |