You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by sy...@apache.org on 2022/02/11 13:57:14 UTC
[zookeeper] branch branch-3.7 updated: ZOOKEEPER-4468: Update documentation about BCFKS keystore/truststore format
This is an automated email from the ASF dual-hosted git repository.
symat pushed a commit to branch branch-3.7
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.7 by this push:
new c1f2025 ZOOKEEPER-4468: Update documentation about BCFKS keystore/truststore format
c1f2025 is described below
commit c1f2025abd87db5b44982e15fbc1b79e12ec47a9
Author: Mate Szalay-Beko <sy...@apache.org>
AuthorDate: Fri Feb 11 13:53:30 2022 +0000
ZOOKEEPER-4468: Update documentation about BCFKS keystore/truststore format
The BCFKS keystore/truststore format support was backported to branch 3.5, I updated the documentation.
Author: Mate Szalay-Beko <ms...@cloudera.com>
Reviewers: Norbert Kalmar <nk...@apache.org>, Andor Molnar <an...@apache.org>
Closes #1816 from symat/ZOOKEEPER-4468-doc-update
(cherry picked from commit 0b0dfe521f374bb473aebc858bdde8fc4c491f7a)
Signed-off-by: Mate Szalay-Beko <sy...@apache.org>
---
zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md b/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md
index a6d69b6..4576732 100644
--- a/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md
+++ b/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md
@@ -1638,7 +1638,7 @@ and [SASL authentication for ZooKeeper](https://cwiki.apache.org/confluence/disp
**New in 3.5.5:**
Specifies the file format of client and quorum keystores. Values: JKS, PEM, PKCS12 or null (detect by filename).
Default: null.
- **New in 3.6.3, 3.7.0:**
+ **New in 3.5.10, 3.6.3, 3.7.0:**
The format BCFKS was added.
* *ssl.trustStore.location* and *ssl.trustStore.password* and *ssl.quorum.trustStore.location* and *ssl.quorum.trustStore.password* :
@@ -1653,7 +1653,7 @@ and [SASL authentication for ZooKeeper](https://cwiki.apache.org/confluence/disp
**New in 3.5.5:**
Specifies the file format of client and quorum trustStores. Values: JKS, PEM, PKCS12 or null (detect by filename).
Default: null.
- **New in 3.6.3, 3.7.0:**
+ **New in 3.5.10, 3.6.3, 3.7.0:**
The format BCFKS was added.
* *ssl.protocol* and *ssl.quorum.protocol* :