You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2014/01/28 02:08:43 UTC
[2/3] git commit: Addressed comments from Reynold
Addressed comments from Reynold
Signed-off-by: Yinan Li <li...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/584323c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/584323c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/584323c6
Branch: refs/heads/master
Commit: 584323c6b13e0d4624eb39360d0caff6c8232aac
Parents: fd833e7
Author: Yinan Li <li...@gmail.com>
Authored: Sat Jan 18 21:28:17 2014 -0800
Committer: Yinan Li <li...@gmail.com>
Committed: Sat Jan 18 21:28:17 2014 -0800
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/util/Utils.scala | 2 +-
docs/configuration.md | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/584323c6/core/src/main/scala/org/apache/spark/util/Utils.scala
----------------------------------------------------------------------
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 e1f8e95..f600c70 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)
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/584323c6/docs/configuration.md
----------------------------------------------------------------------
diff --git a/docs/configuration.md b/docs/configuration.md
index 3b565e4..57e47bf 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>