Re-apply #815 - resolve SparkR implementation conflict#820
Closed
bzz wants to merge 2 commits intoapache:masterfrom
Closed
Re-apply #815 - resolve SparkR implementation conflict#820bzz wants to merge 2 commits intoapache:masterfrom
bzz wants to merge 2 commits intoapache:masterfrom
Conversation
bzz
changed the title
Member
Author
|
\cc @Leemoonsoo for review |
Member
|
LGTM |
Member
Author
|
Thank you @khalidhuseynov ! |
onkarshedge
pushed a commit
to onkarshedge/incubator-zeppelin
that referenced
this pull request
May 11, 2016
### What is this PR for? Somehow final squashed merge commit for apache#815 - fb8e77b does not include 2 changes out of 3 changes: - eeb411e - 9baf57b This PR re-applies Leemoonsoo work on master and should fix the CI ### What type of PR is it? Hot Fix ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Alexander Bezzubov <[email protected]> Closes apache#820 from bzz/re-apply-SparkR-implementation-conflict-815 and squashes the following commits: 60267b4 [Alexander Bezzubov] Change interpreter listing order, re-apply eeb411e 7ec1e2c [Alexander Bezzubov] Change node and npm version, re-apply 9baf57b
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What is this PR for?
Somehow final squashed merge commit for #815 - fb8e77b does not include 2 changes out of 3 changes:
This PR re-applies @Leemoonsoo work on master and should fix the CI
What type of PR is it?
Hot Fix
Questions: