diff options
Diffstat (limited to 'docs/configuration.md')
-rw-r--r-- | docs/configuration.md | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/docs/configuration.md b/docs/configuration.md index da70cabba2..3b565e4347 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -431,6 +431,7 @@ Apart from these, the following properties are also available, and may be useful </td> </tr> <tr> +<<<<<<< HEAD <td>spark.logConf</td> <td>false</td> <td> @@ -459,6 +460,13 @@ Apart from these, the following properties are also available, and may be useful the whole cluster by default. <br/> <b>Note:</b> this setting needs to be configured in the standalone cluster master, not in individual applications; you can set it through <code>SPARK_JAVA_OPTS</code> in <code>spark-env.sh</code>. +</td> +</tr> +<tr> + <td>spark.files.overwrite</td> + <td>false</td> + <td> + Whether to overwrite files added through SparkContext.addFile() when the target file exists and its contents do not match those of the source. </td> </tr> </table> |