diff options
| author | Prashant Sharma <scrapcodes@gmail.com> | 2013-09-15 10:55:12 +0530 |
|---|---|---|
| committer | Prashant Sharma <scrapcodes@gmail.com> | 2013-09-15 10:55:12 +0530 |
| commit | 383e151fd7138cc6a143b3a38037cc3038c2a8b9 (patch) | |
| tree | 0dbb2c0d8fdeff4c37a577eb96acb87ee7838a16 /make-distribution.sh | |
| parent | 20c65bc334091d8d05fb680551155aa182d98f7d (diff) | |
| parent | c4c1db2dd5b2ec0a8182369ecdb0e14f4e199822 (diff) | |
| download | spark-383e151fd7138cc6a143b3a38037cc3038c2a8b9.tar.gz spark-383e151fd7138cc6a143b3a38037cc3038c2a8b9.tar.bz2 spark-383e151fd7138cc6a143b3a38037cc3038c2a8b9.zip | |
Merge branch 'master' of git://github.com/mesos/spark into scala-2.10
Conflicts:
core/src/main/scala/org/apache/spark/SparkContext.scala
project/SparkBuild.scala
Diffstat (limited to 'make-distribution.sh')
| -rwxr-xr-x | make-distribution.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/make-distribution.sh b/make-distribution.sh index 91f6278491..bffb19843c 100755 --- a/make-distribution.sh +++ b/make-distribution.sh @@ -95,7 +95,7 @@ cp $FWDIR/assembly/target/scala*/*assembly*hadoop*.jar "$DISTDIR/jars/" # Copy other things mkdir "$DISTDIR"/conf -cp -r "$FWDIR/conf/*.template" "$DISTDIR" +cp "$FWDIR/conf/*.template" "$DISTDIR"/conf cp -r "$FWDIR/bin" "$DISTDIR" cp -r "$FWDIR/python" "$DISTDIR" cp "$FWDIR/spark-class" "$DISTDIR" |