This is an automated email from the ASF dual-hosted git repository.
symat pushed a commit to branch branch-3.6
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.6 by this push:
new 470b97d ZOOKEEPER-4468: Update documentation about BCFKS
keystore/truststore format
470b97d is described below
commit 470b97da4b0f285f69652125bb9529b56eb5755d
Author: Mate Szalay-Beko <[email protected]>
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 <[email protected]>
Reviewers: Norbert Kalmar <[email protected]>, Andor Molnar
<[email protected]>
Closes #1816 from symat/ZOOKEEPER-4468-doc-update
(cherry picked from commit 0b0dfe521f374bb473aebc858bdde8fc4c491f7a)
Signed-off-by: Mate Szalay-Beko <[email protected]>
---
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 2b78564..0ba32b9 100644
--- a/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md
+++ b/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md
@@ -1426,7 +1426,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* :
@@ -1441,7 +1441,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* :
