diff options
| author | Yinan Li <liyinan926@gmail.com> | 2014-01-18 21:28:17 -0800 |
|---|---|---|
| committer | Yinan Li <liyinan926@gmail.com> | 2014-01-18 21:28:17 -0800 |
| commit | 584323c6b13e0d4624eb39360d0caff6c8232aac (patch) | |
| tree | 097ecf9f78cc2a4870f4c52ec6e4cfc306c9727d | |
| parent | fd833e7ab1bf006c5ae1dff4767b02729e1bbfa7 (diff) | |
| download | spark-584323c6b13e0d4624eb39360d0caff6c8232aac.tar.gz spark-584323c6b13e0d4624eb39360d0caff6c8232aac.tar.bz2 spark-584323c6b13e0d4624eb39360d0caff6c8232aac.zip | |
Addressed comments from Reynold
Signed-off-by: Yinan Li <liyinan926@gmail.com>
| -rw-r--r-- | core/src/main/scala/org/apache/spark/util/Utils.scala | 2 | ||||
| -rw-r--r-- | docs/configuration.md | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/core/src/main/scala/org/apache/spark/util/Utils.scala b/core/src/main/scala/org/apache/spark/util/Utils.scala index e1f8e9520c..f600c7001a 100644 --- a/core/src/main/scala/org/apache/spark/util/Utils.scala +++ b/core/src/main/scala/org/apache/spark/util/Utils.scala @@ -268,7 +268,7 @@ private[spark] object Utils extends Logging { val tempFile = File.createTempFile("fetchFileTemp", null, new File(tempDir)) val targetFile = new File(targetDir, filename) val uri = new URI(url) - val fileOverwrite = System.getProperty("spark.files.overwrite", "false").toBoolean + val fileOverwrite = conf.getBoolean("spark.files.overwrite", false) uri.getScheme match { case "http" | "https" | "ftp" => logInfo("Fetching " + url + " to " + tempFile) diff --git a/docs/configuration.md b/docs/configuration.md index 3b565e4347..57e47bf1b9 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -431,7 +431,6 @@ 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> |