commit 44912d78a00d3614b94291d60fcbe75109542722
author Craig Tiller <ctiller@google.com> Thu Aug 06 09:38:21 2015 -0700
committer Craig Tiller <ctiller@google.com> Thu Aug 06 09:38:21 2015 -0700
tree 00020c7f27c02c5b2839f9df2a831a700a2347c1
parent 354e2127a2fd5003449fb3d6456bd28818d0ac9b

Explicitly spell out cancellation in default propagation mask

include/grpc/grpc.h

diff --git a/include/grpc/grpc.h b/include/grpc/grpc.h
index 003e1d7..bf340e8 100644
--- a/include/grpc/grpc.h
+++ b/include/grpc/grpc.h
@@ -368,10 +368,10 @@
    GRPC_PROPAGATE_DEFAULTS & ~GRPC_PROPAGATE_DEADLINE to disable deadline 
    propagation. Doing so gives flexibility in the future to define new 
    propagation types that are default inherited or not. */
-#define GRPC_PROPAGATE_DEFAULTS                        \
-  ((gpr_uint32)((0xffff | GRPC_PROPAGATE_DEADLINE |    \
-                 GRPC_PROPAGATE_CENSUS_STATS_CONTEXT | \
-                 GRPC_PROPAGATE_CENSUS_TRACING_CONTEXT)))
+#define GRPC_PROPAGATE_DEFAULTS                                                \
+  ((gpr_uint32)((                                                              \
+      0xffff | GRPC_PROPAGATE_DEADLINE | GRPC_PROPAGATE_CENSUS_STATS_CONTEXT | \
+      GRPC_PROPAGATE_CENSUS_TRACING_CONTEXT | GRPC_PROPAGATE_CANCELLATION)))
 
 /** Initialize the grpc library.