[zeppelin] branch branch-0.8 updated (b69ebbb -> 45ea745)

[zj...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zjffdu pushed a change to branch branch-0.8
in repository https://gitbox.apache.org/repos/asf/zeppelin.git.


 discard b69ebbb  [ZEPPELIN-4365] Docker image for 0.8.2 not available on docker hub
     new 45ea745  [ZEPPELIN-4365] Docker image for 0.8.2 not available on docker hub

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (b69ebbb)
            \
             N -- N -- N   refs/heads/branch-0.8 (45ea745)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 scripts/docker/zeppelin/bin/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[zeppelin] 01/01: [ZEPPELIN-4365] Docker image for 0.8.2 not available on docker hub

[zj...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zjffdu pushed a commit to branch branch-0.8
in repository https://gitbox.apache.org/repos/asf/zeppelin.git

commit 45ea745fc20f7d8a0fa721b1de932a643961be76
Author: Jeff Zhang <zj...@apache.org>
AuthorDate: Fri Oct 4 22:19:24 2019 +0800

    [ZEPPELIN-4365] Docker image for 0.8.2 not available on docker hub
---
 scripts/docker/zeppelin/bin/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/docker/zeppelin/bin/Dockerfile b/scripts/docker/zeppelin/bin/Dockerfile
index 3122a34..3e04ea6 100644
--- a/scripts/docker/zeppelin/bin/Dockerfile
+++ b/scripts/docker/zeppelin/bin/Dockerfile
@@ -71,8 +71,8 @@ RUN echo "$LOG_TAG Install python related packages" && \
     conda update -q conda && \
     conda info -a && \
     conda config --add channels conda-forge && \
-    conda install -q numpy=1.12.1 pandas=0.21.1 matplotlib=2.1.1 pandasql=0.7.3 ipython=5.4.1 jupyter_client=5.1.0 ipykernel=4.7.0 bokeh=0.12.10 && \
-    pip install -q ggplot==0.11.5 grpcio==1.8.2 bkzep==0.4.0
+    conda install -q numpy=1.13.3 pandas=0.21.1 matplotlib=2.1.1 pandasql=0.7.3 ipython=5.4.1 jupyter_client=5.1.0 ipykernel=4.7.0 bokeh=0.12.10 && \
+    pip install -q scipy==0.18.0 ggplot==0.11.5 grpcio==1.8.2 bkzep==0.4.0
 
 RUN echo "$LOG_TAG Install R related packages" && \
     echo "deb http://cran.rstudio.com/bin/linux/ubuntu xenial/" | tee -a /etc/apt/sources.list && \