[incubator-marvin] branch develop updated (298328f -> 3fea8f1)

[we...@apache.org]

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

weichen pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-marvin.git.


    from 298328f  Merge branch 'pr/25' into develop
     add ffc6cca  Update the engine template Dockerfile to install opensdk
     add 4b2708f  Removing process-dependency-links option from pip install
     new 3fea8f1  Merge branch 'pr/26' into develop

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:
 .travis.yml                                                  |  2 +-
 .../management/templates/python-engine/Dockerfile            | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

[incubator-marvin] 01/01: Merge branch 'pr/26' into develop

[we...@apache.org]

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

weichen pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-marvin.git

commit 3fea8f1f239a7dbd8b6e975089b5c12e744b1e7c
Merge: 298328f 4b2708f
Author: weichen <we...@apache.org>
AuthorDate: Tue Jun 25 05:57:41 2019 -0500

    Merge branch 'pr/26' into develop

 .travis.yml                                                  |  2 +-
 .../management/templates/python-engine/Dockerfile            | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)