Pull request merge tool #3

Leemoonsoo · 2015-03-25T20:35:02Z

Since apache/incubator-zeppelin is a mirror, we can not simply click merge button for pull request.
Here's pullrequest merge tool, i modified little bit for Zeppelin, based on Spark's one.

corneadoug · 2015-03-26T00:02:15Z

Is there some options to pass also? Or does everybody has to configure its own?
I see that JIRA_USERNAME and JIRA_PASSWORD for example.
Can you make a quick HOW TO USE?

jongyoul · 2015-03-26T00:39:17Z

This looks like the modified version of spark_merge_pr.py, isn't it? I survey several merging tool for ASF. Do you try to get Mesos' one? https://github.com/apache/mesos/blob/master/support/apply-review.sh I think it's really clear to read code. How about you? Spark's one looks a little bit complicated. And that also support reviewboard, too.

anthonycorbacho · 2015-03-26T01:16:56Z

I like more the mesos apply-review.sh

Leemoonsoo · 2015-03-26T02:15:28Z

Right, it's modification of spark's one.
And thanks for the feedback, but I still prefer to Spark's one over mesos's. The reasons are

Spark's one comments all authors in pull requests when pull requests has commits from more than two contributors while mesos's one does not.
Spark's one summarize all commits with author for the reference, while mesos's one is not.
Mesos's one creates link to review board, which Zeppelin development community is not using it right now.

jongyoul · 2015-03-26T02:38:55Z

Yes, some are rights. Mesos' one doesn't support multiple author, but I think It's rare case. And in case you choose github for merging source, Mesos's doesn't create any reviewboard link whether Zeppelin use it or not. If you need to support mutiple authors, Spark's one would be better.

Leemoonsoo · 2015-03-26T03:38:57Z

@jongyoul Thanks for correction.

@corneadoug
To use this script, minimum requirements are

you should inside of Zeppelin source directory (or setup ZEPPELIN_HOME env variable)
add remote repository https://github.com/apache/incubator-zeppelin.git with name 'apache-github' and fetch it (you can use your favorite name instead of 'apache-github' with PR_REMOTE_NAME env variable)
add remote repository https://git-wip-us.apache.org/repos/asf/incubator-zeppelin with name 'apache' and fetch it (you can use your favorite name instead of 'apache' with PUSH_REMOTE_NAME env variable)

You can optionally setup your JIRA account by setting up JIRA_USERNAME, JIRA_PASSWORD env variable.

and just run the script. script will ask question what you want to do.

bzz · 2015-03-27T02:27:18Z

@Leemoonsoo thank you very much for the tutorial!

As we can always switch, why not we try Spark one first and see? If that does not work for us, let's then try mesos one.

So my suggestion would be to merge this and move on.

BTW I presume each committee could use even his own tool of choice if it follows the process (i.e make reviews-before-commit in GH PRs and not a reviewboard)

Leemoonsoo · 2015-03-27T08:44:24Z

Like @bzz suggested, I think we can first try spark's one and see how it goes. @anthonycorbacho @jongyoul, is it okay for you guys?

jongyoul · 2015-03-27T09:11:48Z

👍 @Leemoonsoo

anthonycorbacho · 2015-03-27T10:05:43Z

yep

Leemoonsoo · 2015-03-27T14:07:28Z

Thanks. I'm merging it.

1) Rest apis to export notebook as JSON 2) Rest api to import notebook from JSON https://issues.apache.org/jira/browse/ZEPPELIN-590 Author: swakrish <swakrish@gmail.com> Author: Ramaswamy Devarajan <ram.devarajan@us.ibm.com> Closes #614 from swakrish/master and squashes the following commits: 83e7a6d [swakrish] Merge pull request #7 from apache/master 042d9af [swakrish] Merge pull request #6 from apache/master f5b0805 [swakrish] Merge branch 'master' of git@github.com:swakrish/incubator-zeppelin.git 869b48f [swakrish] logging the error f8bf1f3 [swakrish] Merge pull request #5 from apache/master f8a992c [swakrish] Merge branch 'master' of git@github.com:swakrish/incubator-zeppelin.git 270e17b [swakrish] changed soureJSON to sourceJson 4cb69be [swakrish] Merge pull request #4 from apache/master e282958 [swakrish] Changed websocket import to use common code e928c14 [swakrish] changed doc to make it http post 4be62f6 [swakrish] Merge branch 'master' of git@github.com:swakrish/incubator-zeppelin.git db6a580 [swakrish] changed HTTP Put to POST in the docs ec14034 [swakrish] Merge pull request #3 from apache/master 630664c [swakrish] Merge pull request #2 from apache/master b080d7d [swakrish] Merge pull request #1 from apache/master db8b016 [Ramaswamy Devarajan] added note not found check for export 7351f31 [Ramaswamy Devarajan] Moved export/import methods to Notebook.java 6c19668 [Ramaswamy Devarajan] Changed http put to Http post for REST import ecb8f1e [Ramaswamy Devarajan] Formatting for google style 9b64a66 [Ramaswamy Devarajan] fixed alignments 0e94dce [Ramaswamy Devarajan] add documentation 3645354 [Ramaswamy Devarajan] Rest Apis to export/import

### What is this PR for? This Good Practice Guide will focus on how to write a controller following the controller as vm concept, and how to provide a nice separation of the code. ### What type of PR is it? Documentation ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1462 ### How should this be tested? Check the `.md` file, or build the website to see the full rendering ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Damien CORNEAU <corneadoug@gmail.com> Closes #1443 from corneadoug/ZEPPELIN-1462 and squashes the following commits: 2dc04e0 [Damien CORNEAU] Address feedbacks a4a2645 [Damien CORNEAU] Add the new Practive Guide Page

### What is this PR for? This PR is for making docker images for zeppelin releases. It contains a script for building image for each release. Another script is used for publishing images to zeppelin Dockerhub account. This repo, https://github.com/mfelgamal/zeppelin-dockers, is a demonstration of this PR. It contains zeppelin-base image and an image for each zeppelin release. ### What type of PR is it? [Feature] ### Todos - Review Comments - Documentation ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1386 ### How should this be tested? - run create_release script or publish_release script. ### Screenshots (if appropriate) ### Questions: - Does the licenses files need update? no - Is there breaking changes for older versions? no - Does this needs documentation? yes Author: mahmoudelgamal <mahmoudf.elgamal@gmail.com> Author: mfelgamal <mahmoudf.elgamal@gmail.com> Author: Mahmoud Elgamal <mahmoudf.elgamal@gmail.com> Author: 1ambda <1amb4a@gmail.com> Closes #1538 from mfelgamal/zeppelin-dockers and squashes the following commits: cc8493f [Mahmoud Elgamal] Merge pull request #3 from 1ambda/fix/remove-startzeppelinsh d48ecef [1ambda] fix: Remove start-zeppelin.sh b64c680 [mahmoudelgamal] Remove gcc and g++ for decreasing the size 1f093d4 [mahmoudelgamal] Add script start-zeppelin to zeppelin-base d2c744e [mahmoudelgamal] add scala to zeppelin-base fd23970 [mahmoudelgamal] remove bash erorr message. e1d4b77 [mahmoudelgamal] add R and python to zeppelin-base e731cb4 [mahmoudelgamal] Add java-cacerts to zeppelin-base e642309 [mahmoudelgamal] Add documentation and some modifications 231a414 [mahmoudelgamal] Add zeppelin-base image ac06f3a [mahmoudelgamal] Make docker image for zeppelin release 48d0a01 [mfelgamal] Merge pull request #1 from apache/master

And redo for CI (apache#3)

### What is this PR for? This PR fixes the issue of newlines and tabs breaking results in the SQL interpreter in Livy. The Livy interpreter will return incorrect results if a row contains \n or \t characters. In the case of the newline, the result will be: Line is missing from results if the \n appears anywhere but the end of a cell `String index out of range: 17` if it appears at the end of a cell In the case of the tab, the result will be misaligned columns if the tab appears in the middle of a cell The output showing these error is attached to the Jira. I have changed the parsing and any newline or tab characters will be escaped ### What type of PR is it? Bug Fix ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-3098 ### How should this be tested? Unittests have been added ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Alex Bush <alex.bush@coxauto.co.uk> Author: Alex Bush <bushnoh@users.noreply.github.com> Closes #2701 from bushnoh/zeppelin-3098 and squashes the following commits: 9f2f6e3 [Alex Bush] Merge pull request #3 from apache/master 14e120d [Alex Bush] Merge pull request #2 from apache/master 46981fd [Alex Bush] Merge pull request #1 from apache/master ee5a41b [Alex Bush] Merge remote-tracking branch 'upstream/master' 67a93b5 [Alex Bush] Merge branch 'master' of https://github.com/bushnoh/zeppelin 31cdbdc [Alex Bush] Added another comment explaining the regexp change d054af0 [Alex Bush] Force a dummy change for Travis 64a42be [Alex Bush] Fix for newline and tab in data

…Spark Interpreter Scala REPL and fix the CI failure due to low Scala version ### What is this PR for? - fix the [CI failure](https://travis-ci.org/github/apache/zeppelin/builds/709913046) due to [PR-3852](#3852) ### What type of PR is it? [Bug Fix] ### Todos * [ ] - Task ### What is the Jira issue? * [ZEPPELIN-4962](https://issues.apache.org/jira/projects/ZEPPELIN/issues/ZEPPELIN-4962) ### How should this be tested? * CI test ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? NO * Is there breaking changes for older versions? NO * Does this needs documentation? Yes Author: xiejiajun <xiejiajun02@163.com> Author: xie-jia-jun <xiejiajun02@163.com> Author: JakeXie <xiejiajun02@163.com> Closes #3860 from xiejiajun/ZEPPELIN-4962 and squashes the following commits: 9128c9b [JakeXie] spark.repl.target docs update ad4c0e3 [xiejiajun] Clear irrelevant code a12d3a9 [xiejiajun] Support for manually specifying the Java version of Spark Interpreter Scala REPL and fix the CI failure due to low Scala version ab2b191 [xiejiajun] Merge branch 'master' of https://github.com/apache/zeppelin into apache-master 5569788 [xiejiajun] Merge branch 'master' of https://github.com/apache/zeppelin into apache-master 0a9af6c [xiejiajun] Merge branch 'master' of https://github.com/apache/zeppelin into apache-master be36b37 [xiejiajun] 合并Apache Master分支冲突解决 1335d55 [xiejiajun] Merge remote-tracking branch 'origin/master' fc59f57 [JakeXie] Merge pull request #4 from apache/master 9cc70fe [xiejiajun] Merge remote-tracking branch 'origin/master' 6ef9b23 [xie-jia-jun] Merge pull request #3 from apache/master 45af87a [xiejiajun] added timeout for getting Thrift client to avoid situations where the interpreter may not be restarted when the interpreter process exits unexpectedly f149c3b [xie-jia-jun] Merge pull request #1 from apache/master 5d4b645 [xie-jia-jun] Support OSSConfigStorage of Aliyun dbb6639 [xie-jia-jun] Add Aliyun OSS SDK bb47849 [xie-jia-jun] Support S3ConfigStorage of AWS

…Spark Interpreter Scala REPL and fix the CI failure due to low Scala version ### What is this PR for? - fix the [CI failure](https://travis-ci.org/github/apache/zeppelin/builds/709913046) due to [PR-3852](#3852) ### What type of PR is it? [Bug Fix] ### Todos * [ ] - Task ### What is the Jira issue? * [ZEPPELIN-4962](https://issues.apache.org/jira/projects/ZEPPELIN/issues/ZEPPELIN-4962) ### How should this be tested? * CI test ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? NO * Is there breaking changes for older versions? NO * Does this needs documentation? Yes Author: xiejiajun <xiejiajun02@163.com> Author: xie-jia-jun <xiejiajun02@163.com> Author: JakeXie <xiejiajun02@163.com> Closes #3860 from xiejiajun/ZEPPELIN-4962 and squashes the following commits: 9128c9b [JakeXie] spark.repl.target docs update ad4c0e3 [xiejiajun] Clear irrelevant code a12d3a9 [xiejiajun] Support for manually specifying the Java version of Spark Interpreter Scala REPL and fix the CI failure due to low Scala version ab2b191 [xiejiajun] Merge branch 'master' of https://github.com/apache/zeppelin into apache-master 5569788 [xiejiajun] Merge branch 'master' of https://github.com/apache/zeppelin into apache-master 0a9af6c [xiejiajun] Merge branch 'master' of https://github.com/apache/zeppelin into apache-master be36b37 [xiejiajun] 合并Apache Master分支冲突解决 1335d55 [xiejiajun] Merge remote-tracking branch 'origin/master' fc59f57 [JakeXie] Merge pull request #4 from apache/master 9cc70fe [xiejiajun] Merge remote-tracking branch 'origin/master' 6ef9b23 [xie-jia-jun] Merge pull request #3 from apache/master 45af87a [xiejiajun] added timeout for getting Thrift client to avoid situations where the interpreter may not be restarted when the interpreter process exits unexpectedly f149c3b [xie-jia-jun] Merge pull request #1 from apache/master 5d4b645 [xie-jia-jun] Support OSSConfigStorage of Aliyun dbb6639 [xie-jia-jun] Add Aliyun OSS SDK bb47849 [xie-jia-jun] Support S3ConfigStorage of AWS (cherry picked from commit 185ffd4) Signed-off-by: Jeff Zhang <zjffdu@apache.org>

Add pull request merge tool

1a70af5

Change JIRA project name to ZEPPELIN

918e85f

jongyoul mentioned this pull request Mar 26, 2015

[ZEPPELIN-7] Support yarn without SPARK_YARN_JAR #4

Closed

asfgit closed this in a007a9b Mar 27, 2015

corneadoug mentioned this pull request Sep 27, 2016

[ZEPPELIN-1495] Add Good Practice #4 #1463

Closed

herval mentioned this pull request Jun 23, 2017

[ZEPPELIN-1470] limiting results from jdbc #2428

Closed

1 task

gef756 added a commit to gef756/zeppelin that referenced this pull request Oct 15, 2017

MRG: Merge remote-tracking branch 'upstream/master' into dev-login-enter

259384a

And redo for CI (apache#3)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Pull request merge tool #3

Pull request merge tool #3

Uh oh!

Leemoonsoo commented Mar 25, 2015

Uh oh!

corneadoug commented Mar 26, 2015

Uh oh!

jongyoul commented Mar 26, 2015

Uh oh!

anthonycorbacho commented Mar 26, 2015

Uh oh!

Leemoonsoo commented Mar 26, 2015

Uh oh!

jongyoul commented Mar 26, 2015

Uh oh!

Leemoonsoo commented Mar 26, 2015

Uh oh!

bzz commented Mar 27, 2015

Uh oh!

Leemoonsoo commented Mar 27, 2015

Uh oh!

jongyoul commented Mar 27, 2015

Uh oh!

anthonycorbacho commented Mar 27, 2015

Uh oh!

Leemoonsoo commented Mar 27, 2015

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Pull request merge tool #3

Pull request merge tool #3

Uh oh!

Conversation

Leemoonsoo commented Mar 25, 2015

Uh oh!

corneadoug commented Mar 26, 2015

Uh oh!

jongyoul commented Mar 26, 2015

Uh oh!

anthonycorbacho commented Mar 26, 2015

Uh oh!

Leemoonsoo commented Mar 26, 2015

Uh oh!

jongyoul commented Mar 26, 2015

Uh oh!

Leemoonsoo commented Mar 26, 2015

Uh oh!

bzz commented Mar 27, 2015

Uh oh!

Leemoonsoo commented Mar 27, 2015

Uh oh!

jongyoul commented Mar 27, 2015

Uh oh!

anthonycorbacho commented Mar 27, 2015

Uh oh!

Leemoonsoo commented Mar 27, 2015

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants