diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-08-01 16:12:04 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-08-01 16:12:04 -0700 |
| commit | 6728bef3b1edc9b7f4e4c31b18cd5f5a2747e8f1 (patch) | |
| tree | 843a9b5a3a45a3a3aca0e4975b0522c38bc3974c /src/core/surface/call.h | |
| parent | fa44f18516747cf6d8a17fe5d8f687b8acf03b5f (diff) | |
| parent | 584717758bf0ee9ef165f85b95720d3e4701ff9b (diff) | |
Merge branch 'propagate' of github.com:ctiller/grpc into propagate
Conflicts:
src/core/surface/channel.c
Diffstat (limited to 'src/core/surface/call.h')
| -rw-r--r-- | src/core/surface/call.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/surface/call.h b/src/core/surface/call.h index f2cc8fa352..75bdbce980 100644 --- a/src/core/surface/call.h +++ b/src/core/surface/call.h @@ -86,7 +86,7 @@ typedef void (*grpc_ioreq_completion_func)(grpc_call *call, int success, void *user_data); grpc_call *grpc_call_create(grpc_channel *channel, grpc_call *parent_call, - gpr_uint32 inheritance_mask, + gpr_uint32 propagation_mask, grpc_completion_queue *cq, const void *server_transport_data, grpc_mdelem **add_initial_metadata, |