From 694cc814bd36d1779c08ee08825a723a5b6e9a02 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 21 Sep 2016 10:52:56 -0700 Subject: [PATCH] Fix docs --- doc/environment_variables.md | 5 ++++- third_party/nanopb | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/environment_variables.md b/doc/environment_variables.md index 578bfe7eb77..74b7862c7df 100644 --- a/doc/environment_variables.md +++ b/doc/environment_variables.md @@ -9,7 +9,7 @@ some configuration as environment variables that can be set. grpc_shutdown(). Set to 1 to cause the abort, if unset or 0 it does not abort the process. -* GRPC_GOOGLE_CREDENTIALS_ENV_VAR +* GOOGLE_APPLICATION_CREDENTIALS The path to find the credentials to use when Google credentials are created * GRPC_SSL_CIPHER_SUITES @@ -17,6 +17,9 @@ some configuration as environment variables that can be set. Defaults to: ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-GCM-SHA384 +* GRPC_DEFAULT_SSL_ROOTS_FILE_PATH + PEM file to load SSL roots from + * GRPC_POLL_STRATEGY [posix-style environments only] Declares which polling engines to try when starting gRPC. This is a comma-separated list of engines, which are tried in priority order diff --git a/third_party/nanopb b/third_party/nanopb index f8ac4637662..68a86e96481 160000 --- a/third_party/nanopb +++ b/third_party/nanopb @@ -1 +1 @@ -Subproject commit f8ac463766281625ad710900479130c7fcb4d63b +Subproject commit 68a86e96481e6bea987df8de47027847b30c325b