You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2016/04/05 20:22:40 UTC

incubator-zeppelin git commit: [WIP] Two SparkR implementation conflict in master branch

Repository: incubator-zeppelin
Updated Branches:
  refs/heads/master 7d6cc7e99 -> fb8e77bfd


[WIP] Two SparkR implementation conflict in master branch

### What is this PR for?
Recently #208 and #702 are merged into master branch.
They passed the CI test individually, but failing after both merged.

* zeppelin-web build error
```
[ERROR] npm ERR! registry error parsing json
[ERROR] npm http 200 https://registry.npmjs.org/bower/1.7.2
[ERROR] npm ERR! SyntaxError: Unexpected token 
[ERROR] npm ERR! ��Y[o�6�+��6��ulE���
[ERROR] npm ERR! �{h��C�ˑ�L=RJ��o�9b�4����W4�["��wn���E���2C�ϕn���U`��a�
[ERROR] npm ERR! G�p^��$e�Ley,��IU�"/K�,qr�[8�F���^���p������Z�����=x?�}��{W�+���ܳЀ쵱���}
```

* 'SparkRInterpreter.java' and 'RRepl.java' uses the same interpreter name. 'spark.r'.
That conflicts and make https://github.com/apache/incubator-zeppelin/blob/master/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java#L87 fails.

* R.md and r.md both exists under same directory. That confuses git client.

### What type of PR is it?
Hot Fix

### Todos
* [x] - Merge R.md and r.md
* [x] - Fix zeppelin-web build error
* [x] - Change interpreter listing order

### What is the Jira issue?

### How should this be tested?

### 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: Lee moon soo <mo...@apache.org>

This patch had conflicts when merged, resolved by
Committer: Lee moon soo <mo...@apache.org>

Closes #815 from Leemoonsoo/r_hotfix and squashes the following commits:

eeb411e [Lee moon soo] Change interpreter listing order
9baf57b [Lee moon soo] Change node and npm version
6854ac7 [Lee moon soo] R.md -> r.md


Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/fb8e77bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/fb8e77bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/fb8e77bf

Branch: refs/heads/master
Commit: fb8e77bfd7296a08106b44fd834e4cf0d6950a70
Parents: 7d6cc7e
Author: Lee moon soo <mo...@apache.org>
Authored: Tue Apr 5 21:27:51 2016 +0900
Committer: Lee moon soo <mo...@apache.org>
Committed: Wed Apr 6 03:23:07 2016 +0900

----------------------------------------------------------------------
 docs/interpreter/R.md | 41 -----------------------------------------
 1 file changed, 41 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/fb8e77bf/docs/interpreter/R.md
----------------------------------------------------------------------
diff --git a/docs/interpreter/R.md b/docs/interpreter/R.md
deleted file mode 100644
index fde9983..0000000
--- a/docs/interpreter/R.md
+++ /dev/null
@@ -1,41 +0,0 @@
----
-layout: page
-title: "R Interpreter"
-description: ""
-group: manual
----
-{% include JB/setup %}
-
-## R Interpreter for Apache Zeppelin
-
-[R](https://www.r-project.org) is a free software environment for statistical computing and graphics.
-
-To run R code and visualize plots in Apache Zeppelin, you will need R on your master node (or your dev laptop).
-
-+ For Centos: `yum install R R-devel libcurl-devel openssl-devel`
-+ For Ubuntu: `apt-get install r-base`
-    
-Validate your installation with a simple R command:
-
-```
-R -e "print(1+1)"
-```
-
-To enjoy plots, install additional libraries with:
-
-```
-+ devtools with `R -e "install.packages('devtools', repos = 'http://cran.us.r-project.org')"`
-+ knitr with `R -e "install.packages('knitr', repos = 'http://cran.us.r-project.org')"`
-+ ggplot2 with `R -e "install.packages('ggplot2', repos = 'http://cran.us.r-project.org')"`
-+ Other vizualisation librairies: `R -e "install.packages(c('devtools','mplot', 'googleVis'), repos = 'http://cran.us.r-project.org'); require(devtools); install_github('ramnathv/rCharts')"`
-```
-
-We recommend you to also install the following optional R libraries for happy data analytics:
-
-+ glmnet
-+ pROC
-+ data.table
-+ caret
-+ sqldf
-+ wordcloud
-