aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuoQiang Li <witgo@qq.com>2015-08-29 13:20:22 -0700
committerMichael Armbrust <michael@databricks.com>2015-08-29 13:21:04 -0700
commitd17316f8b6286c0f8b40cfd86b14abebba6ac6af (patch)
tree4122215b56dc089bb2117b0df3237675e337c441
parent69d856527d50d01624feaf1461af2d7bff03a668 (diff)
downloadspark-d17316f8b6286c0f8b40cfd86b14abebba6ac6af.tar.gz
spark-d17316f8b6286c0f8b40cfd86b14abebba6ac6af.tar.bz2
spark-d17316f8b6286c0f8b40cfd86b14abebba6ac6af.zip
[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>
-rw-r--r--docs/sql-programming-guide.md10
1 files changed, 0 insertions, 10 deletions
diff --git a/docs/sql-programming-guide.md b/docs/sql-programming-guide.md
index e8eb88488e..6a1b0fbfa1 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