You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by fe...@apache.org on 2017/11/06 09:02:21 UTC
zeppelin git commit: [ZEPPELIN-3017] fix Spark version in Dockerfiles
Repository: zeppelin
Updated Branches:
refs/heads/master 4054320a4 -> 2674291d6
[ZEPPELIN-3017] fix Spark version in Dockerfiles
### What is this PR for?
The PR updates Spark version to the current 2.1.2, since the one which is present now (2.1.1) is not available anymore.
### What type of PR is it?
Fix
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-3017
### How should this be tested?
manually
Author: mark91 <ma...@gmail.com>
Closes #2636 from mgaido91/ZEPPELIN-3017 and squashes the following commits:
b3cfb44 [mark91] [ZEPPELIN-3017] fix Spark version in Dockerfiles
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/2674291d
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/2674291d
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/2674291d
Branch: refs/heads/master
Commit: 2674291d6835f57b1132474e7e91fa3926b2973f
Parents: 4054320
Author: mark91 <ma...@gmail.com>
Authored: Mon Oct 30 19:06:57 2017 +0100
Committer: Felix Cheung <fe...@apache.org>
Committed: Mon Nov 6 01:02:16 2017 -0800
----------------------------------------------------------------------
scripts/docker/spark-cluster-managers/spark_mesos/Dockerfile | 2 +-
scripts/docker/spark-cluster-managers/spark_standalone/Dockerfile | 2 +-
.../docker/spark-cluster-managers/spark_yarn_cluster/Dockerfile | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2674291d/scripts/docker/spark-cluster-managers/spark_mesos/Dockerfile
----------------------------------------------------------------------
diff --git a/scripts/docker/spark-cluster-managers/spark_mesos/Dockerfile b/scripts/docker/spark-cluster-managers/spark_mesos/Dockerfile
index f47b16d..0afda57 100644
--- a/scripts/docker/spark-cluster-managers/spark_mesos/Dockerfile
+++ b/scripts/docker/spark-cluster-managers/spark_mesos/Dockerfile
@@ -15,7 +15,7 @@
FROM centos:centos6
ENV SPARK_PROFILE 2.1
-ENV SPARK_VERSION 2.1.1
+ENV SPARK_VERSION 2.1.2
ENV HADOOP_PROFILE 2.7
ENV HADOOP_VERSION 2.7.0
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2674291d/scripts/docker/spark-cluster-managers/spark_standalone/Dockerfile
----------------------------------------------------------------------
diff --git a/scripts/docker/spark-cluster-managers/spark_standalone/Dockerfile b/scripts/docker/spark-cluster-managers/spark_standalone/Dockerfile
index 19391d0..8bf0f8d 100644
--- a/scripts/docker/spark-cluster-managers/spark_standalone/Dockerfile
+++ b/scripts/docker/spark-cluster-managers/spark_standalone/Dockerfile
@@ -15,7 +15,7 @@
FROM centos:centos6
ENV SPARK_PROFILE 2.1
-ENV SPARK_VERSION 2.1.1
+ENV SPARK_VERSION 2.1.2
ENV HADOOP_PROFILE 2.7
ENV SPARK_HOME /usr/local/spark
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2674291d/scripts/docker/spark-cluster-managers/spark_yarn_cluster/Dockerfile
----------------------------------------------------------------------
diff --git a/scripts/docker/spark-cluster-managers/spark_yarn_cluster/Dockerfile b/scripts/docker/spark-cluster-managers/spark_yarn_cluster/Dockerfile
index 116d4c3..cbbda20 100644
--- a/scripts/docker/spark-cluster-managers/spark_yarn_cluster/Dockerfile
+++ b/scripts/docker/spark-cluster-managers/spark_yarn_cluster/Dockerfile
@@ -15,7 +15,7 @@
FROM centos:centos6
ENV SPARK_PROFILE 2.1
-ENV SPARK_VERSION 2.1.1
+ENV SPARK_VERSION 2.1.2
ENV HADOOP_PROFILE 2.7
ENV HADOOP_VERSION 2.7.0