spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marmb...@apache.org
Subject spark git commit: [SPARK-10350] [DOC] [SQL] Removed duplicated option description from SQL guide
Date Sat, 29 Aug 2015 20:21:09 GMT
Repository: spark
Updated Branches:
  refs/heads/branch-1.5 69d856527 -> d17316f8b


[SPARK-10350] [DOC] [SQL] Removed duplicated option description from SQL guide

Author: GuoQiang Li <witgo@qq.com>

Closes #8520 from witgo/SPARK-10350.

(cherry picked from commit 5369be806848f43cb87c76504258c4e7de930c90)
Signed-off-by: Michael Armbrust <michael@databricks.com>


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

Branch: refs/heads/branch-1.5
Commit: d17316f8b6286c0f8b40cfd86b14abebba6ac6af
Parents: 69d8565
Author: GuoQiang Li <witgo@qq.com>
Authored: Sat Aug 29 13:20:22 2015 -0700
Committer: Michael Armbrust <michael@databricks.com>
Committed: Sat Aug 29 13:21:04 2015 -0700

----------------------------------------------------------------------
 docs/sql-programming-guide.md | 10 ----------
 1 file changed, 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/d17316f8/docs/sql-programming-guide.md
----------------------------------------------------------------------
diff --git a/docs/sql-programming-guide.md b/docs/sql-programming-guide.md
index e8eb884..6a1b0fb 100644
--- a/docs/sql-programming-guide.md
+++ b/docs/sql-programming-guide.md
@@ -1405,16 +1405,6 @@ Configuration of Parquet can be done using the `setConf` method on
`SQLContext`
     </p>
   </td>
 </tr>
-<tr>
-  <td><code>spark.sql.parquet.mergeSchema</code></td>
-  <td><code>false</code></td>
-  <td>
-    <p>
-      When true, the Parquet data source merges schemas collected from all data files, otherwise
the
-      schema is picked from the summary file or a random data file if no summary file is
available.
-    </p>
-  </td>
-</tr>
 </table>
 
 ## JSON Datasets


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


Mime
View raw message