aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/grpc/impl
diff options
context:
space:
mode:
authorGravatar Muxi Yan <muxi@users.noreply.github.com>2018-10-25 15:43:09 -0700
committerGravatar GitHub <noreply@github.com>2018-10-25 15:43:09 -0700
commitc88e509ba6510c3bc24de55662e5ee0cba718f98 (patch)
tree44a60388b8cfcab3ab46d890ee1b90625ac6e1fd /include/grpc/impl
parenta8a7c2bdd10eb7dc9e072327da2ddb70e5785cf7 (diff)
parent08ef3bca1a10cb3ee46aa2037fe412c75407a067 (diff)
Merge branch 'master' into config-isolation
Diffstat (limited to 'include/grpc/impl')
-rw-r--r--include/grpc/impl/codegen/grpc_types.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/grpc/impl/codegen/grpc_types.h b/include/grpc/impl/codegen/grpc_types.h
index 4cf13edca9..402e490e34 100644
--- a/include/grpc/impl/codegen/grpc_types.h
+++ b/include/grpc/impl/codegen/grpc_types.h
@@ -347,6 +347,9 @@ typedef struct {
/** If set to non zero, surfaces the user agent string to the server. User
agent is surfaced by default. */
#define GRPC_ARG_SURFACE_USER_AGENT "grpc.surface_user_agent"
+/** If set, inhibits health checking (which may be enabled via the
+ * service config.) */
+#define GRPC_ARG_INHIBIT_HEALTH_CHECKING "grpc.inhibit_health_checking"
/** gRPC Objective-C channel pooling domain string. */
#define GRPC_ARG_CHANNEL_POOL_DOMAIN "grpc.channel_pooling_domain"
/** gRPC Objective-C channel pooling id. */