diff options
author | Marcelo Vanzin <vanzin@cloudera.com> | 2016-03-10 22:15:30 -0800 |
---|---|---|
committer | Reynold Xin <rxin@databricks.com> | 2016-03-10 22:15:30 -0800 |
commit | e33bc67c8f936b7e0e4b94741794e162c0f402d3 (patch) | |
tree | 1ea7f6e0256a991d13846abb3afb056f2c4d5623 /core | |
parent | 74c4e2651fa27d65ad1fb71c1855f5c44a37a462 (diff) | |
download | spark-e33bc67c8f936b7e0e4b94741794e162c0f402d3.tar.gz spark-e33bc67c8f936b7e0e4b94741794e162c0f402d3.tar.bz2 spark-e33bc67c8f936b7e0e4b94741794e162c0f402d3.zip |
[MINOR][CORE] Fix a duplicate "and" in a log message.
Author: Marcelo Vanzin <vanzin@cloudera.com>
Closes #11642 from vanzin/spark-conf-typo.
Diffstat (limited to 'core')
-rw-r--r-- | core/src/main/scala/org/apache/spark/SparkConf.scala | 2 |
1 files changed, 1 insertions, 1 deletions
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")) { |