aboutsummaryrefslogtreecommitdiff
path: root/docs/configuration.md
diff options
context:
space:
mode:
authorMarcelo Vanzin <vanzin@cloudera.com>2015-09-21 13:15:44 -0700
committerJosh Rosen <joshrosen@databricks.com>2015-09-21 13:15:44 -0700
commit97a99dde6e8d69a4c4c135dc1d9b1520b2548b5b (patch)
treeb9d16e67a13352068bce4f2d522f813c34346a6a /docs/configuration.md
parentaeef44a3e32b53f7adecc8e9cfd684fb4598e87d (diff)
downloadspark-97a99dde6e8d69a4c4c135dc1d9b1520b2548b5b.tar.gz
spark-97a99dde6e8d69a4c4c135dc1d9b1520b2548b5b.tar.bz2
spark-97a99dde6e8d69a4c4c135dc1d9b1520b2548b5b.zip
[SPARK-10676] [DOCS] Add documentation for SASL encryption options.
Author: Marcelo Vanzin <vanzin@cloudera.com> Closes #8803 from vanzin/SPARK-10676.
Diffstat (limited to 'docs/configuration.md')
-rw-r--r--docs/configuration.md16
1 files changed, 16 insertions, 0 deletions
diff --git a/docs/configuration.md b/docs/configuration.md
index b22587c703..284f97ad09 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -1286,6 +1286,22 @@ Apart from these, the following properties are also available, and may be useful
</td>
</tr>
<tr>
+ <td><code>spark.authenticate.enableSaslEncryption</code></td>
+ <td>false</td>
+ <td>
+ Enable encrypted communication when authentication is enabled. This option is currently
+ only supported by the block transfer service.
+ </td>
+</tr>
+<tr>
+ <td><code>spark.network.sasl.serverAlwaysEncrypt</code></td>
+ <td>false</td>
+ <td>
+ Disable unencrypted connections for services that support SASL authentication. This is
+ currently supported by the external shuffle service.
+ </td>
+</tr>
+<tr>
<td><code>spark.core.connection.ack.wait.timeout</code></td>
<td>60s</td>
<td>