Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

Spark version bug 1256 #1257

Merged
merged 13 commits into from
Jul 18, 2017
Merged

Spark version bug 1256 #1257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ddf35ea
Fixed bug where SPARK_HOME_TGZ was mispelled
deanwampler Mar 11, 2017
43b0dfb
New support for Zeppelin 0.7.0 with Spark 2.1.
Mar 11, 2017
7b5440e
Changed the Spark image tag.
Mar 18, 2017
83b64d0
Added "default" settings for "executor_docker_image" and "spark" -> "…
Mar 31, 2017
360f87d
Wrong Hadoop version in the "uris" string.
deanwampler Mar 31, 2017
82c9c45
Fixed wrong version in the hadoop part of the string
Mar 31, 2017
9087429
Merge remote-tracking branch 'refs/remotes/origin/version-3.x' into v…
Mar 31, 2017
602ce4c
Merge remote-tracking branch 'primary/version-3.x' into version-3.x
Jun 26, 2017
04e20d1
Replaced the mesosphere docker image for Zeppelin with jshenguru's. U…
Jun 26, 2017
3755c3f
Bumped the package version and added preInstallNotes.
Jun 26, 2017
05258be
Bug fix: wrong Spark version minor number.
Jun 29, 2017
3ce2d5f
merge from the Mesosphere fork
Jun 29, 2017
c37b9fa
Fix merge problem
Jun 29, 2017
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
4 changes: 2 additions & 2 deletions repo/packages/Z/zeppelin/4/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
"uri": {
"type": "string",
"description": "A URI serving the Spark distribution to use for the local Zeppelin Spark context. By default, this will use the value specified in this package's resource.json",
"default": "https://downloads.mesosphere.com/spark/assets/spark-2.1.0-bin-2.7.tgz"
"default": "https://downloads.mesosphere.com/spark/assets/spark-2.1.1-bin-2.7.tgz"
},
"executor_docker_image": {
"type": "string",
"description": "The docker image to launch Spark executors with. By default, this will use this value specified in this package's resource.json",
"default": "mesosphere/spark:1.1.0-2.1.0-hadoop-2.7"
"default": "mesosphere/spark:1.1.0-2.1.1-hadoop-2.7"
},
"cores_max": {
"type": "string",
Expand Down
4 changes: 2 additions & 2 deletions repo/packages/Z/zeppelin/4/resource.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
"container": {
"docker": {
"zeppelin": "jshenguru/dcos-zeppelin:0.7.0",
"spark": "mesosphere/spark:1.1.0-2.1.0-hadoop-2.7"
"spark": "mesosphere/spark:1.1.0-2.1.1-hadoop-2.7"
}
},
"uris": {
"spark": "https://downloads.mesosphere.com/spark/assets/spark-2.1.0-bin-2.7.tgz"
"spark": "https://downloads.mesosphere.com/spark/assets/spark-2.1.1-bin-2.7.tgz"
}
}
}