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

Commit

Permalink
Spark version bug 1256 (#1257)
Browse files Browse the repository at this point in the history
* Fixed bug where SPARK_HOME_TGZ was mispelled

It was spelled SnPARK_HOME_TGZ

* New support for Zeppelin 0.7.0 with Spark 2.1.

* Changed the Spark image tag.

* Added "default" settings for "executor_docker_image" and "spark" -> "properties" -> "uri", per request from jshenguru.

* Wrong Hadoop version in the "uris" string.

* Fixed wrong version in the hadoop part of the string

* Replaced the mesosphere docker image for Zeppelin with jshenguru's. Updated the mesosphere image for Spark to the latest.

* Bumped the package version and added preInstallNotes.

* Bug fix: wrong Spark version minor number.

* Fix merge problem
  • Loading branch information
deanwampler authored and ryadav88 committed Jul 18, 2017
1 parent 57760c6 commit 11dbb1b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions repo/packages/Z/zeppelin/4/config.json
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
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"
}
}
}

0 comments on commit 11dbb1b

Please sign in to comment.