diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-01-03 21:29:33 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-01-03 21:29:33 -0800 |
| commit | 604fad9c39763012d97b404941f7ba7137ec2eed (patch) | |
| tree | a327c39fcf9ac53e17fbeb5dfedb11e04f505f3c /assembly/src/main | |
| parent | 9e6f3bdcda1ab48159afa4f54b64d05e42a8688e (diff) | |
| parent | c4d6145f7fde8a516024e886314bf8fecde817ea (diff) | |
| download | spark-604fad9c39763012d97b404941f7ba7137ec2eed.tar.gz spark-604fad9c39763012d97b404941f7ba7137ec2eed.tar.bz2 spark-604fad9c39763012d97b404941f7ba7137ec2eed.zip | |
Merge remote-tracking branch 'apache-github/master' into remove-binaries
Conflicts:
core/src/test/scala/org/apache/spark/DriverSuite.scala
docs/python-programming-guide.md
Diffstat (limited to 'assembly/src/main')
| -rw-r--r-- | assembly/src/main/assembly/assembly.xml | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/assembly/src/main/assembly/assembly.xml b/assembly/src/main/assembly/assembly.xml index 47d3fa93d0..6af383db65 100644 --- a/assembly/src/main/assembly/assembly.xml +++ b/assembly/src/main/assembly/assembly.xml @@ -39,23 +39,20 @@ </fileSet> <fileSet> <directory> - ${project.parent.basedir}/bin/ + ${project.parent.basedir}/sbin/ </directory> - <outputDirectory>/bin</outputDirectory> + <outputDirectory>/sbin</outputDirectory> <includes> <include>**/*</include> </includes> </fileSet> <fileSet> <directory> - ${project.parent.basedir} + ${project.parent.basedir}/bin/ </directory> <outputDirectory>/bin</outputDirectory> <includes> - <include>run-example*</include> - <include>spark-class*</include> - <include>spark-shell*</include> - <include>spark-executor*</include> + <include>**/*</include> </includes> </fileSet> </fileSets> |