From 97a99dde6e8d69a4c4c135dc1d9b1520b2548b5b Mon Sep 17 00:00:00 2001
From: Marcelo Vanzin <vanzin@cloudera.com>
Date: Mon, 21 Sep 2015 13:15:44 -0700
Subject: [SPARK-10676] [DOCS] Add documentation for SASL encryption options.

Author: Marcelo Vanzin <vanzin@cloudera.com>

Closes #8803 from vanzin/SPARK-10676.
---
 docs/configuration.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'docs/configuration.md')

diff --git a/docs/configuration.md b/docs/configuration.md
index b22587c703..284f97ad09 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -1285,6 +1285,22 @@ Apart from these, the following properties are also available, and may be useful
     not running on YARN and authentication is enabled.
   </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>
-- 
cgit v1.2.3