You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marvin.apache.org by lu...@apache.org on 2018/11/07 20:34:44 UTC

[incubator-marvin] 01/01: Merge pull request #1 from Wei-1/master

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

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

commit a0e318a7d0d2c06462b5f382dd4afcaca08f4528
Merge: ecaef4c b0e35ef
Author: Lucas Bonatto Miguel <lu...@apache.org>
AuthorDate: Wed Nov 7 12:34:39 2018 -0800

    Merge pull request #1 from Wei-1/master
    
    Move Travis CI out from sub-directory

 .travis.yml                 | 91 +++++++++++++++++++++++++++++++++++++++++++++
 engine-executor/.travis.yml | 53 --------------------------
 python-toolbox/.travis.yml  | 38 -------------------
 3 files changed, 91 insertions(+), 91 deletions(-)


Merging pull request, was Fwd: [incubator-marvin] 01/01: Merge pull request #1 from Wei-1/master

Posted by Luciano Resende <lu...@gmail.com>.
I would suggest that we don't just merge PRs where a "merge commit" is
created, either squash + cherry pick or adapt one of the merge pr
scripts available in multiple projects (e.g. Spark)...



---------- Forwarded message ---------
From: <lu...@apache.org>
Date: Wed, Nov 7, 2018 at 12:34 PM
Subject: [incubator-marvin] 01/01: Merge pull request #1 from Wei-1/master
To: commits@marvin.apache.org <co...@marvin.apache.org>


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

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

commit a0e318a7d0d2c06462b5f382dd4afcaca08f4528
Merge: ecaef4c b0e35ef
Author: Lucas Bonatto Miguel <lu...@apache.org>
AuthorDate: Wed Nov 7 12:34:39 2018 -0800

    Merge pull request #1 from Wei-1/master

    Move Travis CI out from sub-directory

 .travis.yml                 | 91 +++++++++++++++++++++++++++++++++++++++++++++
 engine-executor/.travis.yml | 53 --------------------------
 python-toolbox/.travis.yml  | 38 -------------------
 3 files changed, 91 insertions(+), 91 deletions(-)



-- 
Luciano Resende
http://twitter.com/lresende1975
http://lresende.blogspot.com/