Repository: spark Updated Branches: refs/heads/branch-1.6 34effc46c -> 47a58c799
[DOC] fix 'spark.memory.offHeap.enabled' default value to false modify 'spark.memory.offHeap.enabled' default value to false Author: zzcclp <xm_...@sina.com> Closes #10633 from zzcclp/fix_spark.memory.offHeap.enabled_default_value. (cherry picked from commit 84e77a15df18ba3f1cc871a3c52c783b46e52369) Signed-off-by: Reynold Xin <r...@databricks.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/47a58c79 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/47a58c79 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/47a58c79 Branch: refs/heads/branch-1.6 Commit: 47a58c799206d011587e03178a259974be47d3bc Parents: 34effc4 Author: zzcclp <xm_...@sina.com> Authored: Wed Jan 6 23:06:21 2016 -0800 Committer: Reynold Xin <r...@databricks.com> Committed: Wed Jan 6 23:06:30 2016 -0800 ---------------------------------------------------------------------- docs/configuration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/47a58c79/docs/configuration.md ---------------------------------------------------------------------- diff --git a/docs/configuration.md b/docs/configuration.md index 488dc52..995af6a 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -740,7 +740,7 @@ Apart from these, the following properties are also available, and may be useful </tr> <tr> <td><code>spark.memory.offHeap.enabled</code></td> - <td>true</td> + <td>false</td> <td> If true, Spark will attempt to use off-heap memory for certain operations. If off-heap memory use is enabled, then <code>spark.memory.offHeap.size</code> must be positive. </td> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
