aboutsummaryrefslogtreecommitdiff
path: root/yarn/src
diff options
context:
space:
mode:
authorMarcelo Vanzin <vanzin@cloudera.com>2016-04-06 19:33:48 -0700
committerJosh Rosen <joshrosen@databricks.com>2016-04-06 19:33:51 -0700
commit21d5ca128bf3afd5c2d4c7fcc56240e28443474f (patch)
treedb73dea769bed75e3e07a2869461685e9693a620 /yarn/src
parentd76592276f9f66fed8012d876595de8717f516a9 (diff)
downloadspark-21d5ca128bf3afd5c2d4c7fcc56240e28443474f.tar.gz
spark-21d5ca128bf3afd5c2d4c7fcc56240e28443474f.tar.bz2
spark-21d5ca128bf3afd5c2d4c7fcc56240e28443474f.zip
[SPARK-14134][CORE] Change the package name used for shading classes.
The current package name uses a dash, which is a little weird but seemed to work. That is, until a new test tried to mock a class that references one of those shaded types, and then things started failing. Most changes are just noise to fix the logging configs. For reference, SPARK-8815 also raised this issue, although at the time it did not cause any issues in Spark, so it was not addressed. Author: Marcelo Vanzin <vanzin@cloudera.com> Closes #11941 from vanzin/SPARK-14134.
Diffstat (limited to 'yarn/src')
-rw-r--r--yarn/src/test/resources/log4j.properties2
-rw-r--r--yarn/src/test/scala/org/apache/spark/deploy/yarn/BaseYarnClusterSuite.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/yarn/src/test/resources/log4j.properties b/yarn/src/test/resources/log4j.properties
index 6b9a799954..d13454d5ae 100644
--- a/yarn/src/test/resources/log4j.properties
+++ b/yarn/src/test/resources/log4j.properties
@@ -28,4 +28,4 @@ log4j.logger.com.sun.jersey=WARN
log4j.logger.org.apache.hadoop=WARN
log4j.logger.org.eclipse.jetty=WARN
log4j.logger.org.mortbay=WARN
-log4j.logger.org.spark-project.jetty=WARN
+log4j.logger.org.spark_project.jetty=WARN
diff --git a/yarn/src/test/scala/org/apache/spark/deploy/yarn/BaseYarnClusterSuite.scala b/yarn/src/test/scala/org/apache/spark/deploy/yarn/BaseYarnClusterSuite.scala
index 2f3a31cb04..9c3b18e4ec 100644
--- a/yarn/src/test/scala/org/apache/spark/deploy/yarn/BaseYarnClusterSuite.scala
+++ b/yarn/src/test/scala/org/apache/spark/deploy/yarn/BaseYarnClusterSuite.scala
@@ -53,7 +53,7 @@ abstract class BaseYarnClusterSuite
|log4j.logger.org.apache.hadoop=WARN
|log4j.logger.org.eclipse.jetty=WARN
|log4j.logger.org.mortbay=WARN
- |log4j.logger.org.spark-project.jetty=WARN
+ |log4j.logger.org.spark_project.jetty=WARN
""".stripMargin
private var yarnCluster: MiniYARNCluster = _