diff options
| author |  ncteisen <ncteisen@gmail.com> | 2018-08-28 12:53:57 -0700 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-08-28 12:53:57 -0700 |
| commit | 4b5b019d5644affef122e06c6898811286850b8d (patch) | |
| tree | 73c601dc31c436e3d800a846d08b9ace7ff05235 /doc/ssl-performance.md | |
| parent | b8f030bc0b507903e9d156fb44d161015273d0c6 (diff) | |
| parent | ee65a5eaee45a765d1d4176a797bb8288faeb180 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into channelz-subchannels
Diffstat (limited to 'doc/ssl-performance.md')
| -rw-r--r-- | doc/ssl-performance.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/ssl-performance.md b/doc/ssl-performance.md index 176c8d8f24..711b9dff09 100644 --- a/doc/ssl-performance.md +++ b/doc/ssl-performance.md @@ -14,7 +14,9 @@ Makefile | all other cases | all | :x: Bazel | | Linux | :heavy_check_mark: Bazel | | MacOS | :heavy_check_mark: Bazel | | Windows | :x: -CMake | boringssl from submodule (default) | all | :x: +CMake | boringssl from submodule (default) | Linux or MacOS | :heavy_check_mark: +CMake | boringssl from submodule (default), generator=Ninja | Windows | :heavy_check_mark: +CMake | boringssl from submodule (default), generator=Visual Studio | Windows | :x: CMake | pre-installed OpenSSL 1.0.2+ (`gRPC_SSL_PROVIDER=package`) | all | :heavy_check_mark: ## Other Languages: Binary/Source Packages |