summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMate Szalay-Beko <symat@apache.org>2022-02-11 13:53:30 +0000
committerMate Szalay-Beko <symat@apache.org>2022-02-11 13:53:30 +0000
commit0b0dfe521f374bb473aebc858bdde8fc4c491f7a (patch)
tree98f7a5fa7ed54c19fc376e4a8fbe08d494d7a601
parentebcf18e52fa095773429348ce495d59c896f4a26 (diff)
downloadzookeeper-0b0dfe521f374bb473aebc858bdde8fc4c491f7a.tar.gz
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 <mszalay@cloudera.com> Reviewers: Norbert Kalmar <nkalmar@apache.org>, Andor Molnar <andor@apache.org> Closes #1816 from symat/ZOOKEEPER-4468-doc-update
-rw-r--r--zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md4
1 files 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 0b658d0c3..23e85804b 100644
--- a/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md
+++ b/zookeeper-docs/src/main/resources/markdown/zookeeperAdmin.md
@@ -1654,7 +1654,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* :
@@ -1675,7 +1675,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* :