diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-09-22 16:24:12 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-09-22 16:24:12 -0700 |
| commit | b0bd53a173be44f77fda30b0ed406a0882f24391 (patch) | |
| tree | 3c454570e00e54977901cac2cf9cea743f197cb2 /src/core/channel | |
| parent | 4ed7a7585f14175137b39bc9b59ae4687ef35d0f (diff) | |
| parent | 41aab15c74130ae36850d88c8bea0063c83236e7 (diff) | |
Merge github.com:grpc/grpc into shindig
Conflicts:
src/core/surface/secure_channel_create.c
Diffstat (limited to 'src/core/channel')
| -rw-r--r-- | src/core/channel/channel_args.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/channel/channel_args.h b/src/core/channel/channel_args.h index f9e7b05860..480cc9aec2 100644 --- a/src/core/channel/channel_args.h +++ b/src/core/channel/channel_args.h @@ -71,7 +71,7 @@ grpc_channel_args *grpc_channel_args_set_compression_algorithm( * compression algorithms are enabled. It's an error to disable an algorithm set * by grpc_channel_args_set_compression_algorithm. * - * Returns an instance will the updated algorithm states. The \a a pointer is + * Returns an instance with the updated algorithm states. The \a a pointer is * modified to point to the returned instance (which may be different from the * input value of \a a). */ grpc_channel_args *grpc_channel_args_compression_algorithm_set_state( |