Skip to content

Commit c1f2025

Browse files
committed
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 0b0dfe5) Signed-off-by: Mate Szalay-Beko <[email protected]>
1 parent 965571e commit c1f2025

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1638,7 +1638,7 @@ and [SASL authentication for ZooKeeper](https://cwiki.apache.org/confluence/disp
16381638
**New in 3.5.5:**
16391639
Specifies the file format of client and quorum keystores. Values: JKS, PEM, PKCS12 or null (detect by filename).
16401640
Default: null.
1641-
**New in 3.6.3, 3.7.0:**
1641+
**New in 3.5.10, 3.6.3, 3.7.0:**
16421642
The format BCFKS was added.
16431643

16441644
* *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
16531653
**New in 3.5.5:**
16541654
Specifies the file format of client and quorum trustStores. Values: JKS, PEM, PKCS12 or null (detect by filename).
16551655
Default: null.
1656-
**New in 3.6.3, 3.7.0:**
1656+
**New in 3.5.10, 3.6.3, 3.7.0:**
16571657
The format BCFKS was added.
16581658

16591659
* *ssl.protocol* and *ssl.quorum.protocol* :

0 commit comments

Comments
 (0)