spark git commit: [SPARK-4761] [DOC] [SQL] kryo default setting in SQL Thrift server

[rx...@apache.org]

Repository: spark
Updated Branches:
  refs/heads/master 72ba0fc4f -> 10fc2f6f5


[SPARK-4761] [DOC] [SQL] kryo default setting in SQL Thrift server

this is a follow up of #3621

/cc liancheng pwendell

Author: Daoyuan Wang <da...@intel.com>

Closes #6639 from adrian-wang/kryodoc and squashes the following commits:

3c4b1cf [Daoyuan Wang] [DOC] kryo default setting in SQL Thrift server


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/10fc2f6f
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/10fc2f6f
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/10fc2f6f

Branch: refs/heads/master
Commit: 10fc2f6f51819f263eec941bdc1db22c554f9118
Parents: 72ba0fc
Author: Daoyuan Wang <da...@intel.com>
Authored: Mon Jun 8 01:07:50 2015 -0700
Committer: Reynold Xin <rx...@databricks.com>
Committed: Mon Jun 8 01:07:50 2015 -0700

----------------------------------------------------------------------
 docs/configuration.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/10fc2f6f/docs/configuration.md
----------------------------------------------------------------------
diff --git a/docs/configuration.md b/docs/configuration.md
index 9667ceb..3960e7e 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -618,7 +618,7 @@ Apart from these, the following properties are also available, and may be useful
 </tr>
 <tr>
   <td><code>spark.kryo.referenceTracking</code></td>
-  <td>true</td>
+  <td>true (false when using Spark SQL Thrift Server)</td>
   <td>
     Whether to track references to the same object when serializing data with Kryo, which is
     necessary if your object graphs have loops and useful for efficiency if they contain multiple
@@ -679,7 +679,10 @@ Apart from these, the following properties are also available, and may be useful
 </tr>
 <tr>
   <td><code>spark.serializer</code></td>
-  <td>org.apache.spark.serializer.<br />JavaSerializer</td>
+  <td>
+    org.apache.spark.serializer.<br />JavaSerializer (org.apache.spark.serializer.<br />
+    KryoSerializer when using Spark SQL Thrift Server)
+  </td>
   <td>
     Class to use for serializing objects that will be sent over the network or need to be cached
     in serialized form. The default of Java serialization works with any Serializable Java object


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org