diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-01-08 00:38:31 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-01-08 00:38:31 -0800 |
| commit | bc81ce040ded3fe791ecffb15baa408346afc92a (patch) | |
| tree | 3330fddcffbca7bd8f42f2fa96ded31cdb0430f9 /assembly | |
| parent | 3ec21f2eee0a322bcb5cce9678a816b012227a61 (diff) | |
| parent | bb6a39a6872fb8e7118c5a402b7b9d67459e9a64 (diff) | |
| download | spark-bc81ce040ded3fe791ecffb15baa408346afc92a.tar.gz spark-bc81ce040ded3fe791ecffb15baa408346afc92a.tar.bz2 spark-bc81ce040ded3fe791ecffb15baa408346afc92a.zip | |
Merge remote-tracking branch 'apache-github/master' into standalone-driver
Conflicts:
core/src/test/scala/org/apache/spark/deploy/JsonProtocolSuite.scala
pom.xml
Diffstat (limited to 'assembly')
| -rw-r--r-- | assembly/pom.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/assembly/pom.xml b/assembly/pom.xml index 9b70812c64..54a25910ce 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -108,12 +108,12 @@ <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> <resource>META-INF/services/org.apache.hadoop.fs.FileSystem</resource> </transformer> - </transformers> - <transformers> - <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> <resource>reference.conf</resource> </transformer> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>log4j.properties</resource> + </transformer> </transformers> </configuration> </execution> |