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 2016/03/11 07:15:32 UTC
spark git commit: [MINOR][CORE] Fix a duplicate "and" in a log
message.
Repository: spark
Updated Branches:
refs/heads/master 74c4e2651 -> e33bc67c8
[MINOR][CORE] Fix a duplicate "and" in a log message.
Author: Marcelo Vanzin <va...@cloudera.com>
Closes #11642 from vanzin/spark-conf-typo.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/e33bc67c
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/e33bc67c
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/e33bc67c
Branch: refs/heads/master
Commit: e33bc67c8f936b7e0e4b94741794e162c0f402d3
Parents: 74c4e26
Author: Marcelo Vanzin <va...@cloudera.com>
Authored: Thu Mar 10 22:15:30 2016 -0800
Committer: Reynold Xin <rx...@databricks.com>
Committed: Thu Mar 10 22:15:30 2016 -0800
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/SparkConf.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/e33bc67c/core/src/main/scala/org/apache/spark/SparkConf.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/SparkConf.scala b/core/src/main/scala/org/apache/spark/SparkConf.scala
index f9c01f3..aaccf49 100644
--- a/core/src/main/scala/org/apache/spark/SparkConf.scala
+++ b/core/src/main/scala/org/apache/spark/SparkConf.scala
@@ -718,7 +718,7 @@ private[spark] object SparkConf extends Logging {
allAlternatives.get(key).foreach { case (newKey, cfg) =>
logWarning(
s"The configuration key '$key' has been deprecated as of Spark ${cfg.version} and " +
- s"and may be removed in the future. Please use the new key '$newKey' instead.")
+ s"may be removed in the future. Please use the new key '$newKey' instead.")
return
}
if (key.startsWith("spark.akka") || key.startsWith("spark.ssl.akka")) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org