From e33bc67c8f936b7e0e4b94741794e162c0f402d3 Mon Sep 17 00:00:00 2001 From: Marcelo Vanzin Date: Thu, 10 Mar 2016 22:15:30 -0800 Subject: [MINOR][CORE] Fix a duplicate "and" in a log message. Author: Marcelo Vanzin Closes #11642 from vanzin/spark-conf-typo. --- core/src/main/scala/org/apache/spark/SparkConf.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core') diff --git a/core/src/main/scala/org/apache/spark/SparkConf.scala b/core/src/main/scala/org/apache/spark/SparkConf.scala index f9c01f30f1..aaccf49eeb 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")) { -- cgit v1.2.3