Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
spark
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cs525-sp18-g07
spark
Commits
e8ec2a7b
Commit
e8ec2a7b
authored
9 years ago
by
Yin Huai
Browse files
Options
Downloads
Patches
Plain Diff
Revert "[SPARK-11236][CORE] Update Tachyon dependency from 0.7.1 -> 0.8.0."
This reverts commit
4f5e60c6
.
parent
45029bfd
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
core/pom.xml
+5
-1
5 additions, 1 deletion
core/pom.xml
make-distribution.sh
+4
-4
4 additions, 4 deletions
make-distribution.sh
with
9 additions
and
5 deletions
core/pom.xml
+
5
−
1
View file @
e8ec2a7b
...
...
@@ -266,7 +266,7 @@
<dependency>
<groupId>
org.tachyonproject
</groupId>
<artifactId>
tachyon-client
</artifactId>
<version>
0.
8.0
</version>
<version>
0.
7.1
</version>
<exclusions>
<exclusion>
<groupId>
org.apache.hadoop
</groupId>
...
...
@@ -288,6 +288,10 @@
<groupId>
org.tachyonproject
</groupId>
<artifactId>
tachyon-underfs-glusterfs
</artifactId>
</exclusion>
<exclusion>
<groupId>
org.tachyonproject
</groupId>
<artifactId>
tachyon-underfs-s3
</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
...
...
This diff is collapsed.
Click to expand it.
make-distribution.sh
+
4
−
4
View file @
e8ec2a7b
...
...
@@ -33,9 +33,9 @@ SPARK_HOME="$(cd "`dirname "$0"`"; pwd)"
DISTDIR
=
"
$SPARK_HOME
/dist"
SPARK_TACHYON
=
false
TACHYON_VERSION
=
"0.
8.0
"
TACHYON_VERSION
=
"0.
7.1
"
TACHYON_TGZ
=
"tachyon-
${
TACHYON_VERSION
}
-bin.tar.gz"
TACHYON_URL
=
"http://
tachyon-project.org
/download
s/files
/
${
TACHYON_VERSION
}
/
${
TACHYON_TGZ
}
"
TACHYON_URL
=
"http
s
://
github.com/amplab/tachyon/releases
/download/
v
${
TACHYON_VERSION
}
/
${
TACHYON_TGZ
}
"
MAKE_TGZ
=
false
NAME
=
none
...
...
@@ -240,10 +240,10 @@ if [ "$SPARK_TACHYON" == "true" ]; then
fi
tar
xzf
"
${
TACHYON_TGZ
}
"
cp
"tachyon-
${
TACHYON_VERSION
}
/
assembly
/target/tachyon-
assemblies-
${
TACHYON_VERSION
}
-jar-with-dependencies.jar"
"
$DISTDIR
/lib"
cp
"tachyon-
${
TACHYON_VERSION
}
/
core
/target/tachyon-
${
TACHYON_VERSION
}
-jar-with-dependencies.jar"
"
$DISTDIR
/lib"
mkdir
-p
"
$DISTDIR
/tachyon/src/main/java/tachyon/web"
cp
-r
"tachyon-
${
TACHYON_VERSION
}
"
/
{
bin,conf,libexec
}
"
$DISTDIR
/tachyon"
cp
-r
"tachyon-
${
TACHYON_VERSION
}
"
/
servers
/src/main/java/tachyon/web
"
$DISTDIR
/tachyon/src/main/java/tachyon/web"
cp
-r
"tachyon-
${
TACHYON_VERSION
}
"
/
core
/src/main/java/tachyon/web
"
$DISTDIR
/tachyon/src/main/java/tachyon/web"
if
[[
`
uname
-a
`
==
Darwin
*
]]
;
then
# need to run sed differently on osx
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment