[GitHub] incubator-zeppelin pull request: [WIP] Two SparkR implementation c...

[Leemoonsoo]

GitHub user Leemoonsoo opened a pull request:

    https://github.com/apache/incubator-zeppelin/pull/815

    [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
    * [ ] - Fix interpreter name conflict
    
    ### 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


You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/Leemoonsoo/incubator-zeppelin r_hotfix

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/incubator-zeppelin/pull/815.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 #815
    
----
commit 6854ac7e0a5adf592ec801dd8ef033d04f53c537
Author: Lee moon soo <m...@apache.org>
Date:   2016-04-05T09:01:49Z

    R.md -> r.md

commit 9baf57b68c702e87845158503d8ace749937dbcc
Author: Lee moon soo <m...@apache.org>
Date:   2016-04-05T09:47:42Z

    Change node and npm version

----


---
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.
---