You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2013/09/10 21:40:57 UTC

[43/50] git commit: Fix copy issue in https://github.com/mesos/spark/pull/899

Fix copy issue in https://github.com/mesos/spark/pull/899


Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/f5a8afa6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/f5a8afa6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/f5a8afa6

Branch: refs/heads/branch-0.8
Commit: f5a8afa6c38c6d3a3bf170e609468ff1d610f3ea
Parents: a85758c
Author: Matei Zaharia <ma...@eecs.berkeley.edu>
Authored: Mon Sep 9 13:47:56 2013 -0700
Committer: Matei Zaharia <ma...@eecs.berkeley.edu>
Committed: Mon Sep 9 13:47:56 2013 -0700

----------------------------------------------------------------------
 make-distribution.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/f5a8afa6/make-distribution.sh
----------------------------------------------------------------------
diff --git a/make-distribution.sh b/make-distribution.sh
index 91f6278..bffb198 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"