From 11dbb1b678604713174c0513a9f29934bb7fa587 Mon Sep 17 00:00:00 2001
From: Dean Wampler <dean@polyglotprogramming.com>
Date: Mon, 17 Jul 2017 23:30:50 -0500
Subject: [PATCH] Spark version bug 1256 (#1257)

* 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
---
 repo/packages/Z/zeppelin/4/config.json   | 4 ++--
 repo/packages/Z/zeppelin/4/resource.json | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/repo/packages/Z/zeppelin/4/config.json b/repo/packages/Z/zeppelin/4/config.json
index 3ff586b18..9b2d7f3a7 100644
--- a/repo/packages/Z/zeppelin/4/config.json
+++ b/repo/packages/Z/zeppelin/4/config.json
@@ -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",
diff --git a/repo/packages/Z/zeppelin/4/resource.json b/repo/packages/Z/zeppelin/4/resource.json
index 1e1949ecd..9c9d62bf0 100644
--- a/repo/packages/Z/zeppelin/4/resource.json
+++ b/repo/packages/Z/zeppelin/4/resource.json
@@ -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"
     }
   }
 }