diff options
author | Julien Boeuf <jboeuf@google.com> | 2015-11-17 18:53:55 -0800 |
---|---|---|
committer | Julien Boeuf <jboeuf@google.com> | 2015-11-17 18:53:55 -0800 |
commit | 802f6b672456610ba4366b7b953399749a5774d6 (patch) | |
tree | ab90250fcbdcdc41b7da4bf9aba779181d797689 /include/grpc++/support | |
parent | 334314b8887da1b082777c69945dead45182af7f (diff) | |
parent | 7fc77e06ba5becaebb66aa3d83b5bf7d26a94ddc (diff) |
Merge branch 'master' of https://github.com/grpc/grpc into update_ssl_cert
Diffstat (limited to 'include/grpc++/support')
-rw-r--r-- | include/grpc++/support/channel_arguments.h | 3 | ||||
-rw-r--r-- | include/grpc++/support/time.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/grpc++/support/channel_arguments.h b/include/grpc++/support/channel_arguments.h index 9957712a96..4da76a83ed 100644 --- a/include/grpc++/support/channel_arguments.h +++ b/include/grpc++/support/channel_arguments.h @@ -70,7 +70,8 @@ class ChannelArguments { void SetChannelArgs(grpc_channel_args* channel_args) const; // gRPC specific channel argument setters - /// Set target name override for SSL host name checking. + /// Set target name override for SSL host name checking. This option is for + /// testing only and should never be used in production. void SetSslTargetNameOverride(const grpc::string& name); // TODO(yangg) add flow control options /// Set the compression algorithm for the channel. diff --git a/include/grpc++/support/time.h b/include/grpc++/support/time.h index 2d4196b93b..e00e0d8e91 100644 --- a/include/grpc++/support/time.h +++ b/include/grpc++/support/time.h @@ -35,6 +35,7 @@ #define GRPCXX_SUPPORT_TIME_H #include <grpc++/support/config.h> +#include <grpc/support/time.h> namespace grpc { |