diff options
| author | Marcelo Vanzin <vanzin@cloudera.com> | 2016-04-06 19:33:48 -0700 |
|---|---|---|
| committer | Josh Rosen <joshrosen@databricks.com> | 2016-04-06 19:33:51 -0700 |
| commit | 21d5ca128bf3afd5c2d4c7fcc56240e28443474f (patch) | |
| tree | db73dea769bed75e3e07a2869461685e9693a620 /core | |
| parent | d76592276f9f66fed8012d876595de8717f516a9 (diff) | |
| download | spark-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 'core')
| -rw-r--r-- | core/src/main/resources/org/apache/spark/log4j-defaults.properties | 4 | ||||
| -rw-r--r-- | core/src/test/resources/log4j.properties | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/core/src/main/resources/org/apache/spark/log4j-defaults.properties b/core/src/main/resources/org/apache/spark/log4j-defaults.properties index 0750488e4a..89a7963a86 100644 --- a/core/src/main/resources/org/apache/spark/log4j-defaults.properties +++ b/core/src/main/resources/org/apache/spark/log4j-defaults.properties @@ -28,8 +28,8 @@ log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{1}: log4j.logger.org.apache.spark.repl.Main=WARN # Settings to quiet third party logs that are too verbose -log4j.logger.org.spark-project.jetty=WARN -log4j.logger.org.spark-project.jetty.util.component.AbstractLifeCycle=ERROR +log4j.logger.org.spark_project.jetty=WARN +log4j.logger.org.spark_project.jetty.util.component.AbstractLifeCycle=ERROR log4j.logger.org.apache.spark.repl.SparkIMain$exprTyper=INFO log4j.logger.org.apache.spark.repl.SparkILoop$SparkILoopInterpreter=INFO diff --git a/core/src/test/resources/log4j.properties b/core/src/test/resources/log4j.properties index a54d27de91..fb9d9851cb 100644 --- a/core/src/test/resources/log4j.properties +++ b/core/src/test/resources/log4j.properties @@ -33,5 +33,4 @@ log4j.appender.console.layout=org.apache.log4j.PatternLayout log4j.appender.console.layout.ConversionPattern=%t: %m%n # Ignore messages below warning level from Jetty, because it's a bit verbose -log4j.logger.org.spark-project.jetty=WARN -org.spark-project.jetty.LEVEL=WARN +log4j.logger.org.spark_project.jetty=WARN |