Skip to content

Commit 470b97d

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 d764b2f commit 470b97d

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
@@ -1426,7 +1426,7 @@ and [SASL authentication for ZooKeeper](https://cwiki.apache.org/confluence/disp
14261426
**New in 3.5.5:**
14271427
Specifies the file format of client and quorum keystores. Values: JKS, PEM, PKCS12 or null (detect by filename).
14281428
Default: null.
1429-
**New in 3.6.3, 3.7.0:**
1429+
**New in 3.5.10, 3.6.3, 3.7.0:**
14301430
The format BCFKS was added.
14311431

14321432
* *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
14411441
**New in 3.5.5:**
14421442
Specifies the file format of client and quorum trustStores. Values: JKS, PEM, PKCS12 or null (detect by filename).
14431443
Default: null.
1444-
**New in 3.6.3, 3.7.0:**
1444+
**New in 3.5.10, 3.6.3, 3.7.0:**
14451445
The format BCFKS was added.
14461446

14471447
* *ssl.protocol* and *ssl.quorum.protocol* :

0 commit comments

Comments
 (0)