GitHub user bzz opened a pull request:
https://github.com/apache/incubator-zeppelin/pull/820
Re-apply #815 - resolve SparkR implementation conflict 815
### What is this PR for?
Somehow squashed merge commit for #815 -
fb8e77bfd7296a08106b44fd834e4cf0d6950a70 does not include 2 changes, eeb411e
and 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
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/bzz/incubator-zeppelin
re-apply-SparkR-implementation-conflict-815
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-zeppelin/pull/820.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #820
----
commit 7ec1e2c50495a5eb5f02a6ef1a2df6deebe161cb
Author: Alexander Bezzubov <b...@apache.org>
Date: 2016-04-06T08:28:55Z
Change node and npm version, re-apply 9baf57b
commit 60267b4618a64f6b0618113bbf06b6d9bdf66f63
Author: Alexander Bezzubov <b...@apache.org>
Date: 2016-04-06T08:32:35Z
Change interpreter listing order, re-apply eeb411e
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
