Skip to content

[WIP] [SPARK-1698]: Improve spark integration #598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
witgo wants to merge 8 commits into from
Closed

[WIP] [SPARK-1698]: Improve spark integration #598

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3d17519
Improved build configuration III
witgo Apr 30, 2014
13cdb4d
Merge branch 'master' of https://github.com/apache/spark into sql-pom
witgo May 2, 2014
3aae189
park-core provided
witgo May 3, 2014
d4ce1f3
Merge branch 'master' of https://github.com/apache/spark into sql-pom
witgo May 3, 2014
b1c0a66
sprk-hive-dist.xml => sprak-hive-dist.xml
witgo May 3, 2014
bc090bd
sprak-hive-dist.xml => spark-hive-dist.xml
witgo May 5, 2014
7efbcf7
merge master
witgo May 7, 2014
d2e4567
merge master
witgo May 15, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
merge master
  • Loading branch information
@witgo
witgo committed May 15, 2014
commit d2e45672931ec28a46cf1ce044e108093b588140
9 changes: 9 additions & 0 deletions assembly/src/main/assembly/spark-dist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
<include>**/*</include>
</includes>
</fileSet>
<fileSet>
<directory>
${project.parent.basedir}/ec2/
</directory>
<outputDirectory>/ec2</outputDirectory>
<includes>
<include>**/*</include>
</includes>
</fileSet>
<fileSet>
<directory>
${project.parent.basedir}/bin/
Expand Down
13 changes: 13 additions & 0 deletions make-distribution.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,23 @@ echo "Spark $VERSION built for Hadoop $SPARK_HADOOP_VERSION" > "$DISTDIR/RELEASE
# Copy jars
cp -r $FWDIR/assembly/target/*spark-dist/* "$DISTDIR/"
cp -r $FWDIR/examples/target/*spark-examples-dist/* "$DISTDIR/"

# Copy example sources (needed for python and SQL)
mkdir -p "$DISTDIR//share/spark/examples/src/main"
cp -r $FWDIR/examples/src/main "$DISTDIR//share/spark/examples/src/main"

if [ "$SPARK_HIVE" == "true" ]; then
cp -r $FWDIR/sql/hive/target/*spark-hive-dist/* "$DISTDIR/"
fi

# Copy license and ASF files
cp "$FWDIR/LICENSE" "$DISTDIR"
cp "$FWDIR/NOTICE" "$DISTDIR"

if [ -e $FWDIR/CHANGES.txt ]; then
cp "$FWDIR/CHANGES.txt" "$DISTDIR"
fi

# Download and copy in tachyon, if requested
if [ "$SPARK_TACHYON" == "true" ]; then
TACHYON_VERSION="0.4.1"
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.