Skip to content

Re-apply #815 - resolve SparkR implementation conflict - #820

Closed
bzz wants to merge 2 commits into
apache:masterfrom
bzz:re-apply-SparkR-implementation-conflict-815
Closed

Re-apply #815 - resolve SparkR implementation conflict#820
bzz wants to merge 2 commits into
apache:masterfrom
bzz:re-apply-SparkR-implementation-conflict-815

Conversation

@bzz

@bzzbzz commented Apr 6, 2016

Copy link
Copy Markdown
Member

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:

  • Does the licenses files need update? No
  • Is there breaking changes for older versions? No
  • Does this needs documentation? No

@bzzbzz changed the title Re-apply #815 - resolve SparkR implementation conflict 815Re-apply #815 - resolve SparkR implementation conflictApr 6, 2016
@bzz

bzz commented Apr 6, 2016

Copy link
Copy Markdown
MemberAuthor

\cc @Leemoonsoo for review

@khalidhuseynov

Copy link
Copy Markdown
Member

LGTM

@bzz

bzz commented Apr 6, 2016

Copy link
Copy Markdown
MemberAuthor

Thank you @khalidhuseynov !
Merging as this is a hotfix.

@asfgitasfgit closed this in 9cc7e4fApr 6, 2016
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 <bzz@apache.org>
Closesapache#820 from bzz/re-apply-SparkR-implementation-conflict-815 and squashes the following commits:
60267b4 [Alexander Bezzubov] Change interpreter listing order, re-apply eeb411e7ec1e2c [Alexander Bezzubov] Change node and npm version, re-apply 9baf57b
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@bzz@khalidhuseynov