aboutsummaryrefslogtreecommitdiff
path: root/assembly
diff options
context:
space:
mode:
authorshane-huang <shengsheng.huang@intel.com>2013-09-27 09:28:33 +0800
committershane-huang <shengsheng.huang@intel.com>2013-09-27 09:28:33 +0800
commit84849baf88d31cfaaeee158a947c4db1abe94ce6 (patch)
tree364ffa6e77f252264e1ecaf9e517ff387920b8ab /assembly
parent714fdabd99bbff3a0cdec5dcf06b021a3a3f2da8 (diff)
parent3a5aa920fc9839aa99ea1befc467cc1f60230f3d (diff)
downloadspark-84849baf88d31cfaaeee158a947c4db1abe94ce6.tar.gz
spark-84849baf88d31cfaaeee158a947c4db1abe94ce6.tar.bz2
spark-84849baf88d31cfaaeee158a947c4db1abe94ce6.zip
Merge branch 'reorgscripts' into scripts-reorg
Diffstat (limited to 'assembly')
-rw-r--r--assembly/src/main/assembly/assembly.xml11
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>