svn commit: r1758704 - in /zeppelin/site/docs/0.7.0-SNAPSHOT: assets/themes/zeppelin/css/style.css install/install.html

2016-08-31 Thread corneadoug 
Author: corneadoug
Date: Thu Sep  1 05:19:10 2016
New Revision: 1758704

URL: http://svn.apache.org/viewvc?rev=1758704=rev
Log:
deploying PR#1241

Modified:
zeppelin/site/docs/0.7.0-SNAPSHOT/assets/themes/zeppelin/css/style.css
zeppelin/site/docs/0.7.0-SNAPSHOT/install/install.html

Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/assets/themes/zeppelin/css/style.css
URL: 
http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/assets/themes/zeppelin/css/style.css?rev=1758704=1758703=1758704=diff
==
--- zeppelin/site/docs/0.7.0-SNAPSHOT/assets/themes/zeppelin/css/style.css 
(original)
+++ zeppelin/site/docs/0.7.0-SNAPSHOT/assets/themes/zeppelin/css/style.css Thu 
Sep  1 05:19:10 2016
@@ -438,11 +438,10 @@ a.anchor {
 .content table {
   display: block;
   width: 100%;
-  overflow: auto;
   word-break: normal;
   word-break: keep-all;
   -webkit-overflow-scrolling: touch;
-  font-size: 90%;
+  font-size: 87%;
   margin-top: 16px;
   margin-bottom: 16px;
 }

Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/install/install.html
URL: 
http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/install/install.html?rev=1758704=1758703=1758704=diff
==
--- zeppelin/site/docs/0.7.0-SNAPSHOT/install/install.html (original)
+++ zeppelin/site/docs/0.7.0-SNAPSHOT/install/install.html Thu Sep  1 05:19:10 
2016
@@ -152,6 +152,7 @@
 Advanced
 Zeppelin on Vagrant 
VM
 Zeppelin
 on Spark Cluster Mode (Standalone)
+Zeppelin
 on Spark Cluster Mode (YARN)
 
 Contibute
 Writing 
Zeppelin Interpreter
@@ -365,7 +366,7 @@ exec bin/zeppelin-daemon.sh upstart
 zepplin-env.sh
 zepplin-site.xml
 Default value
-Description
+Description
   
   
 ZEPPELIN_PORT
@@ -521,7 +522,7 @@ exec bin/zeppelin-daemon.sh upstart
 ZEPPELIN_NOTEBOOK_AZURE_CONNECTION_STRING
 zeppelin.notebook.azure.connectionString
 
-The Azure storage account connection stringi.e. 
DefaultEndpointsProtocol=https;AccountName=accountName;AccountKey=accountKey
+The Azure storage account connection stringi.e. 
DefaultEndpointsProtocol=https;AccountName=accountName;AccountKey=accountKey
   
   
 ZEPPELIN_NOTEBOOK_AZURE_SHARE

zeppelin git commit: [ZEPPELIN-1217] Remove horizontal scrollbar in Zeppelin conf table

2016-08-31 Thread corneadoug 
Repository: zeppelin
Updated Branches:
  refs/heads/master 93e37620c -> dad72cef5


[ZEPPELIN-1217] Remove horizontal scrollbar in Zeppelin conf table

### What is this PR for?
This PR will fix 
[ZEPPELIN-1217](https://issues.apache.org/jira/browse/ZEPPELIN-1217).

Current [Zeppelin configuration 
table](https://zeppelin.apache.org/docs/0.7.0-SNAPSHOT/install/install.html#apache-zeppelin-configuration)
 is hard to compare the env variable name with the descriptions at a glance 
because of the horizontal scrollbar. So I just removed the scrollbar.

### What type of PR is it?
Improvement

### What is the Jira issue?
[ZEPPELIN-1217](https://issues.apache.org/jira/browse/ZEPPELIN-1217)

### Screenshots (if appropriate)
 - Before
![before](https://cloud.githubusercontent.com/assets/10060731/17239827/10957730-55a2-11e6-90c8-86724d835530.gif)

 - After
![after](https://cloud.githubusercontent.com/assets/10060731/17239828/1374f1a6-55a2-11e6-99c4-01d7959482a4.gif)

### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no

Author: AhyoungRyu 

Closes #1241 from AhyoungRyu/ZEPPELIN-1217 and squashes the following commits:

eb96fc4 [AhyoungRyu] Remove horizontal scrollbar in Zeppelin conf table


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

Branch: refs/heads/master
Commit: dad72cef5f82ead5e3a3f3e5a9e7bce21b4e8c68
Parents: 93e3762
Author: AhyoungRyu 
Authored: Fri Jul 29 15:23:47 2016 +0900
Committer: Damien CORNEAU 
Committed: Thu Sep 1 14:11:49 2016 +0900

--
 docs/assets/themes/zeppelin/css/style.css | 3 +--
 docs/install/install.md   | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/dad72cef/docs/assets/themes/zeppelin/css/style.css
--
diff --git a/docs/assets/themes/zeppelin/css/style.css 
b/docs/assets/themes/zeppelin/css/style.css
index 7fa1b8a..98b3895 100644
--- a/docs/assets/themes/zeppelin/css/style.css
+++ b/docs/assets/themes/zeppelin/css/style.css
@@ -438,11 +438,10 @@ a.anchor {
 .content table {
   display: block;
   width: 100%;
-  overflow: auto;
   word-break: normal;
   word-break: keep-all;
   -webkit-overflow-scrolling: touch;
-  font-size: 90%;
+  font-size: 87%;
   margin-top: 16px;
   margin-bottom: 16px;
 }

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/dad72cef/docs/install/install.md
--
diff --git a/docs/install/install.md b/docs/install/install.md
index b0f9fe4..ee92325 100644
--- a/docs/install/install.md
+++ b/docs/install/install.md
@@ -198,7 +198,7 @@ You can configure Apache Zeppelin with both **environment 
variables** in `conf/z
 zepplin-env.sh
 zepplin-site.xml
 Default value
-Description
+Description
   
   
 ZEPPELIN_PORT
@@ -354,7 +354,7 @@ You can configure Apache Zeppelin with both **environment 
variables** in `conf/z
 ZEPPELIN_NOTEBOOK_AZURE_CONNECTION_STRING
 zeppelin.notebook.azure.connectionString
 
-The Azure storage account connection stringi.e. 
DefaultEndpointsProtocol=https;AccountName=accountName;AccountKey=accountKey
+The Azure storage account connection stringi.e. 
DefaultEndpointsProtocol=https;AccountName=accountName;AccountKey=accountKey
   
   
 ZEPPELIN_NOTEBOOK_AZURE_SHARE

zeppelin git commit: ZEPPELIN-1185. ZEPPELIN_INTP_JAVA_OPTS should not use ZEPPELIN_JAVA_OPTS

2016-08-31 Thread prabhjyotsingh 
Repository: zeppelin
Updated Branches:
  refs/heads/branch-0.6 9bb21d981 -> 1ab5a9d43


ZEPPELIN-1185. ZEPPELIN_INTP_JAVA_OPTS should not use ZEPPELIN_JAVA_OPTS

### What is this PR for?

Don't use ZEPPELIN_JAVA_OPTS as the default value of ZEPPELIN_INTP_JAVA_OPTS

### What type of PR is it?
Improvement

### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-1185

### How should this be tested?
Tested manually. By exporting the following variable, I can debug zeppelin 
server correctly and remote interpreter process can ran successfully. (Before 
this PR, the remote  interpreter process will fail to launch because it would 
also listen the same debug port)
```
export 
ZEPPELIN_JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005"
```

Author: Jeff Zhang 

Closes #1189 from zjffdu/ZEPPELIN-1185 and squashes the following commits:

9e48ad7 [Jeff Zhang] change for windows
3ff5561 [Jeff Zhang] update doc format
e82d889 [Jeff Zhang] add migration doc
ef5a360 [Jeff Zhang] ZEPPELIN-1185. ZEPPELIN_INTP_JAVA_OPTS should not use 
ZEPPELIN_JAVA_OPTS as default value

(cherry picked from commit 93e37620c4906ef20c078a640e3cebae60f14d17)
Signed-off-by: Prabhjyot Singh 


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

Branch: refs/heads/branch-0.6
Commit: 1ab5a9d43791e3b4c28b0dac9f5b174a8a3036f3
Parents: 9bb21d9
Author: Jeff Zhang 
Authored: Thu Aug 4 18:16:56 2016 +0800
Committer: Prabhjyot Singh 
Committed: Thu Sep 1 09:31:53 2016 +0530

--
 bin/common.cmd | 7 ---
 bin/common.sh  | 9 -
 conf/zeppelin-env.cmd.template | 4 ++--
 conf/zeppelin-env.sh.template  | 4 ++--
 docs/install/upgrade.md| 8 +++-
 5 files changed, 11 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1ab5a9d4/bin/common.cmd
--
diff --git a/bin/common.cmd b/bin/common.cmd
index c84f077..b4fb6bf 100644
--- a/bin/common.cmd
+++ b/bin/common.cmd
@@ -81,13 +81,6 @@ if not defined JAVA_OPTS (
 set JAVA_OPTS=%JAVA_OPTS% %ZEPPELIN_JAVA_OPTS%
 )
 
-if not defined ZEPPELIN_INTP_JAVA_OPTS (
-set ZEPPELIN_INTP_JAVA_OPTS=%ZEPPELIN_JAVA_OPTS%
-)
-
-if not defined ZEPPELIN_INTP_MEM (
-set ZEPPELIN_INTP_MEM=%ZEPPELIN_MEM%
-)
 
 set JAVA_INTP_OPTS=%ZEPPELIN_INTP_JAVA_OPTS% 
-Dfile.encoding=%ZEPPELIN_ENCODING%
 

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1ab5a9d4/bin/common.sh
--
diff --git a/bin/common.sh b/bin/common.sh
index 592aa1c..b69f28c 100644
--- a/bin/common.sh
+++ b/bin/common.sh
@@ -121,15 +121,6 @@ JAVA_OPTS+=" ${ZEPPELIN_JAVA_OPTS} 
-Dfile.encoding=${ZEPPELIN_ENCODING} ${ZEPPEL
 JAVA_OPTS+=" 
-Dlog4j.configuration=file://${ZEPPELIN_CONF_DIR}/log4j.properties"
 export JAVA_OPTS
 
-# jvm options for interpreter process
-if [[ -z "${ZEPPELIN_INTP_JAVA_OPTS}" ]]; then
-  export ZEPPELIN_INTP_JAVA_OPTS="${ZEPPELIN_JAVA_OPTS}"
-fi
-
-if [[ -z "${ZEPPELIN_INTP_MEM}" ]]; then
-  export ZEPPELIN_INTP_MEM="${ZEPPELIN_MEM}"
-fi
-
 JAVA_INTP_OPTS="${ZEPPELIN_INTP_JAVA_OPTS} 
-Dfile.encoding=${ZEPPELIN_ENCODING}"
 JAVA_INTP_OPTS+=" 
-Dlog4j.configuration=file://${ZEPPELIN_CONF_DIR}/log4j.properties"
 export JAVA_INTP_OPTS

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1ab5a9d4/conf/zeppelin-env.cmd.template
--
diff --git a/conf/zeppelin-env.cmd.template b/conf/zeppelin-env.cmd.template
index d85e59f..9c7f7f7 100644
--- a/conf/zeppelin-env.cmd.template
+++ b/conf/zeppelin-env.cmd.template
@@ -20,8 +20,8 @@ REM set JAVA_HOME=
 REM set MASTER=REM Spark master url. eg. 
spark://master_addr:7077. Leave empty if you want to use local mode.
 REM set ZEPPELIN_JAVA_OPTS REM Additional jvm options. for 
example, set ZEPPELIN_JAVA_OPTS="-Dspark.executor.memory=8g 
-Dspark.cores.max=16"
 REM set ZEPPELIN_MEM   REM Zeppelin jvm mem options 
Default -Xmx1024m -XX:MaxPermSize=512m
-REM set ZEPPELIN_INTP_MEM  REM zeppelin interpreter 
process jvm mem options. Default = ZEPPELIN_MEM
-REM set ZEPPELIN_INTP_JAVA_OPTSREM zeppelin interpreter 
process jvm options. Default = ZEPPELIN_JAVA_OPTS
+REM set ZEPPELIN_INTP_MEM  REM zeppelin interpreter 
process jvm mem options.
+REM set ZEPPELIN_INTP_JAVA_OPTSREM zeppelin interpreter 
process

zeppelin git commit: [ZEPPELIN-1313] NullPointerException when using Clone notebook REST API

2016-08-31 Thread ahyoungryu 
Repository: zeppelin
Updated Branches:
  refs/heads/master f1a247130 -> 83469be5b


[ZEPPELIN-1313] NullPointerException when using Clone notebook REST API

### What is this PR for?
This fixes when the input json is empty for the clone notebook REST API and for 
this case the default name will be populated.

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

### Todos
NA

### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-1313

### How should this be tested?
When the input json is empty for the clone notebook REST API, the response 
should be 201 with the default name populated.

### 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: Kavin 
Author: Kavin Kumar 

Closes #1348 from kavinkumarks/zeppelin-1313-fix-NPE-clone-notebook and 
squashes the following commits:

941e13b [Kavin] Removed note.id() and replaced the references with note.getId()
11a2903 [Kavin Kumar] Fixed NPE when the input json is empty for clone notebook 
REST API and set the default name for the case.Added test cases too.


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

Branch: refs/heads/master
Commit: 83469be5bac23dbde81f511afb5bb014fce50489
Parents: f1a2471
Author: Kavin 
Authored: Tue Aug 23 12:33:56 2016 +0530
Committer: AhyoungRyu 
Committed: Thu Sep 1 11:56:23 2016 +0900

--
 .../apache/zeppelin/rest/NotebookRestApi.java   |  9 ++-
 .../apache/zeppelin/socket/NotebookServer.java  | 62 +++
 .../zeppelin/rest/InterpreterRestApiTest.java   |  2 +-
 .../zeppelin/rest/NotebookRestApiTest.java  | 27 +++
 .../zeppelin/rest/ZeppelinSparkClusterTest.java | 14 ++--
 .../java/org/apache/zeppelin/notebook/Note.java |  8 +-
 .../org/apache/zeppelin/notebook/NoteInfo.java  |  2 +-
 .../org/apache/zeppelin/notebook/Notebook.java  | 24 +++---
 .../org/apache/zeppelin/notebook/Paragraph.java |  8 +-
 .../zeppelin/notebook/repo/S3NotebookRepo.java  |  2 +-
 .../zeppelin/notebook/repo/VFSNotebookRepo.java |  2 +-
 .../repo/zeppelinhub/ZeppelinHubRepo.java   |  2 +-
 .../helium/HeliumApplicationFactoryTest.java| 12 +--
 .../apache/zeppelin/notebook/NotebookTest.java  | 82 +++-
 .../repo/zeppelinhub/ZeppelinHubRepoTest.java   |  2 +-
 15 files changed, 148 insertions(+), 110 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/83469be5/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java
--
diff --git 
a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java 
b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java
index 6a286a4..db0cbec 100644
--- 
a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java
+++ 
b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java
@@ -319,7 +319,10 @@ public class NotebookRestApi {
   throws IOException, CloneNotSupportedException, IllegalArgumentException 
{
 LOG.info("clone notebook by JSON {}", message);
 NewNotebookRequest request = gson.fromJson(message, 
NewNotebookRequest.class);
-String newNoteName = request.getName();
+String newNoteName = null;
+if (request != null) {
+  newNoteName = request.getName();
+}
 AuthenticationInfo subject = new 
AuthenticationInfo(SecurityUtils.getPrincipal());
 Note newNote = notebook.cloneNote(notebookId, newNoteName, subject);
 notebookServer.broadcastNote(newNote);
@@ -669,7 +672,7 @@ public class NotebookRestApi {
 Map config = note.getConfig();
 config.put("cron", request.getCronString());
 note.setConfig(config);
-notebook.refreshCron(note.id());
+notebook.refreshCron(note.getId());
 
 return new JsonResponse<>(Status.OK).build();
   }
@@ -697,7 +700,7 @@ public class NotebookRestApi {
 Map config = note.getConfig();
 config.put("cron", null);
 note.setConfig(config);
-notebook.refreshCron(note.id());
+notebook.refreshCron(note.getId());
 
 return new JsonResponse<>(Status.OK).build();
   }

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/83469be5/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
--
diff --git 
a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java

zeppelin git commit: [ZEPPELIN-1040] Show the time when the result is updated

2016-08-31 Thread corneadoug 
Repository: zeppelin
Updated Branches:
  refs/heads/master e3e19ecbf -> f1a247130


 [ZEPPELIN-1040] Show the time when the result is updated

### What is this PR for?
As per existing usage, the time shown in end of each paragraph is the time the 
paragraph is updated not when the paragraph is actually executed/run.

_" Took 10 sec. Last updated by anonymous at **August 26 2016, 1:52:01 PM.** "_

PR is aimed at changing the existing usage to show when the paragraph is last 
executed as this gives  clarification to users about the executed time of 
paragraph

### What type of PR is it?
 Improvement

### Todos
* [ ] - Task

### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-1040

### How should this be tested?
1. Start the server and create a new note book
2. create a new paragraph and execute the paragraph
3. Now rerun the paragraph, the time should get updated now inline with 
execution of the paragraph

### 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: rajarajan-g 

Closes #1367 from rajarajan-g/ZEPPELIN-1040 and squashes the following commits:

d30f1b2 [rajarajan-g] code changed for showing last run time after execution of 
paragraph


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

Branch: refs/heads/master
Commit: f1a2471302ed3a6d89f70e3b85c9c20eeddf2056
Parents: e3e19ec
Author: rajarajan-g 
Authored: Fri Aug 26 14:00:10 2016 +0530
Committer: Damien CORNEAU 
Committed: Thu Sep 1 10:39:12 2016 +0900

--
 zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/f1a24713/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
--
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js 
b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
index d66fb76..7889270 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
@@ -820,7 +820,7 @@ 
angular.module('zeppelinWebApp').controller('ParagraphCtrl', function($scope, $r
 }
 var user = (pdata.user === undefined || pdata.user === null) ? 'anonymous' 
: pdata.user;
 var desc = 'Took ' + moment.duration((timeMs / 1000), 'seconds').format('h 
[hrs] m [min] s [sec]') +
-  '. Last updated by ' + user + ' at ' + 
moment(pdata.dateUpdated).format(' DD , h:mm:ss A') + '.';
+  '. Last updated by ' + user + ' at ' + 
moment(pdata.dateFinished).format(' DD , h:mm:ss A') + '.';
 if ($scope.isResultOutdated()) {
   desc += ' (outdated)';
 }

zeppelin git commit: [zeppelin] add temp directories generated by zeppelin-Rinterpreter to gitignore

2016-08-31 Thread jongyoul 
Repository: zeppelin
Updated Branches:
  refs/heads/master d371d96b9 -> e3e19ecbf


[zeppelin] add temp directories generated by zeppelin-Rinterpreter to gitignore

### What is this PR for?
When compile and test zeppelin-Rinterpreter, it will generate temp directories 
`/R` and `/tmp`
add them into `.gitignore`

### What type of PR is it?
Improvement

### Todos
N/A

### What is the Jira issue?
N/A

### How should this be tested?
N/A

### 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: WeichenXu 

Closes #1297 from WeichenXu123/gitignore_add_R_tmp and squashes the following 
commits:

478a0dc [WeichenXu] gitignore add R tmp dir


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

Branch: refs/heads/master
Commit: e3e19ecbf80a4e718344c40de3715c966eb8af92
Parents: d371d96
Author: WeichenXu 
Authored: Fri Aug 5 21:38:08 2016 -0700
Committer: Jongyoul Lee 
Committed: Thu Sep 1 02:34:57 2016 +0900

--
 .gitignore | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e3e19ecb/.gitignore
--
diff --git a/.gitignore b/.gitignore
index 5ad0d7a..1c359d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,7 @@ zeppelin-web/bower_components
 # R
 /r/lib/
 .Rhistory
+/R/
 
 # project level
 /logs/
@@ -108,3 +109,6 @@ tramp
 
 # Generated by zeppelin-examples
 /helium
+
+# tmp files
+/tmp/

zeppelin git commit: [MINOR] Removed unused profiles from spark/pom.xml

2016-08-31 Thread jongyoul 
Repository: zeppelin
Updated Branches:
  refs/heads/master 223d225e0 -> d371d96b9


[MINOR] Removed unused profiles from spark/pom.xml

### What is this PR for?
Making spark/pom.xml simple

### What type of PR is it?
[Refactoring]

### Todos
* [x] - Simplified pom.xml in spark

### What is the Jira issue?
N/A

### How should this be tested?
No test. CI should be green

### 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: Jongyoul Lee 

Closes #1301 from jongyoul/minor/remove-unused-profile-spark-pom and squashes 
the following commits:

10c7bb7 [Jongyoul Lee] Removed yarn dependency
b6d8876 [Jongyoul Lee] Removed yarn dependency
77ddd95 [Jongyoul Lee] Removed unused profiles from spark/pom.xml


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

Branch: refs/heads/master
Commit: d371d96b9ca79d7d9b3e4cb372789f4f864ebe27
Parents: 223d225
Author: Jongyoul Lee 
Authored: Mon Aug 8 16:18:32 2016 +0900
Committer: Jongyoul Lee 
Committed: Wed Aug 31 19:21:10 2016 +0900

--
 spark/pom.xml | 323 -
 1 file changed, 323 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/d371d96b/spark/pom.xml
--
diff --git a/spark/pom.xml b/spark/pom.xml
index 5dcbb51..84c3770 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -483,27 +483,6 @@
 
 
 
-  cassandra-spark-1.1
-  
-
-  com.datastax.spark
-  
spark-cassandra-connector_${scala.binary.version}
-  1.1.1
-  
-
-  org.joda
-  joda-convert
-
-  
-
-  
-  
-1.1.1
-2.2.3-shaded-protobuf
-  
-
-
-
   spark-1.2
   
   
@@ -513,26 +492,6 @@
 
 
 
-  cassandra-spark-1.2
-  
-1.2.1
-  
-  
-
-  com.datastax.spark
-  
spark-cassandra-connector_${scala.binary.version}
-  1.2.1
-  
-
-  org.joda
-  joda-convert
-
-  
-
-  
-
-
-
   spark-1.3
 
   
@@ -545,27 +504,6 @@
 
 
 
-  cassandra-spark-1.3
-  
-1.3.0
-  
-
-  
-
-  com.datastax.spark
-  
spark-cassandra-connector_${scala.binary.version}
-  1.3.1
-  
-
-  org.joda
-  joda-convert
-
-  
-
-  
-
-
-
   spark-1.4
   
 1.4.1
@@ -576,27 +514,6 @@
 
 
 
-  cassandra-spark-1.4
-  
-1.4.1
-  
-
-  
-
-  com.datastax.spark
-  
spark-cassandra-connector_${scala.binary.version}
-  1.4.0
-  
-
-  org.joda
-  joda-convert
-
-  
-
-  
-
-
-
   spark-1.5
   
 1.5.2
@@ -604,34 +521,6 @@
 2.3.11
 2.5.0
   
-
-  
-  
-
-
-
-  cassandra-spark-1.5
-  
-1.5.1
-com.typesafe.akka
-2.3.11
-2.5.0
-16.0.1
-  
-
-  
-
-  com.datastax.spark
-  
spark-cassandra-connector_${scala.binary.version}
-  1.5.0
-  
-
-  org.joda
-  joda-convert
-
-  
-
-  
 
 
 
@@ -732,218 +621,6 @@
   
 
 
-
-  mapr3
-  
-false
-  
-  
-1.0.3-mapr-3.0.3
-2.3.0-mapr-4.0.0-FCS
-0.7.1
-  
-  
-
-  mapr-releases
-  http://repository.mapr.com/maven/
-  
-false
-  
-  
-true
-  
-
-  
-
-
-
-  mapr40
-  
-false
-  
-  
-2.4.1-mapr-1503
-2.4.1-mapr-1503
-0.9.3
-  
-  
-
-  org.apache.curator
-  curator-recipes
-  2.4.0
-  
-
-  org.apache.zookeeper
-  zookeeper
-
-  
-
-
-  org.apache.zookeeper
-  zookeeper
-  3.4.5-mapr-1503
-
-  
-  
-
-  mapr-releases
-  http://repository.mapr.com/maven/
-  
-false
-  
-  
-true
-  
-

zeppelin git commit: [ZEPPELIN-1383][ Interpreters][r-interpreter] remove SparkInterpreter.getSystemDefault and update relative code

2016-08-31 Thread jongyoul 
Repository: zeppelin
Updated Branches:
  refs/heads/master d11221fb8 -> 223d225e0


[ZEPPELIN-1383][ Interpreters][r-interpreter] remove 
SparkInterpreter.getSystemDefault and update relative code

### What is this PR for?
clean some redundant code:
remove `SparkInterpreter.getSystemDefault` methods,
and replace it with `InterpreterProperty.getValue`

### What type of PR is it?
Improvement

### Todos
N/A

### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-1383
remove SparkInterpreter.getSystemDefault and update relative code

### How should this be tested?
Existing tests.

### 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: WeichenXu 

Closes #1372 from WeichenXu123/remove_spark_interpreter_getSystemDefault and 
squashes the following commits:

204a34c [WeichenXu] improve code stype.
841b757 [WeichenXu] update.


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

Branch: refs/heads/master
Commit: 223d225e0119d9e3013206a211df6b70a71b6a66
Parents: d11221f
Author: WeichenXu 
Authored: Sun Aug 28 00:44:26 2016 -0700
Committer: Jongyoul Lee 
Committed: Wed Aug 31 17:07:57 2016 +0900

--
 .../zeppelin/rinterpreter/RInterpreter.scala|  8 +++---
 .../apache/zeppelin/spark/SparkInterpreter.java | 27 +++-
 .../interpreter/InterpreterProperty.java|  1 -
 .../interpreter/InterpreterPropertyBuilder.java |  7 +
 4 files changed, 15 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/223d225e/r/src/main/scala/org/apache/zeppelin/rinterpreter/RInterpreter.scala
--
diff --git 
a/r/src/main/scala/org/apache/zeppelin/rinterpreter/RInterpreter.scala 
b/r/src/main/scala/org/apache/zeppelin/rinterpreter/RInterpreter.scala
index f0558a9..9504573 100644
--- a/r/src/main/scala/org/apache/zeppelin/rinterpreter/RInterpreter.scala
+++ b/r/src/main/scala/org/apache/zeppelin/rinterpreter/RInterpreter.scala
@@ -111,10 +111,10 @@ object RInterpreter {
 
   // These are the additional properties we need on top of the ones provided 
by the spark interpreters
   lazy val props: Map[String, InterpreterProperty] = new 
InterpreterPropertyBuilder()
-.add("rhadoop.cmd",   
SparkInterpreter.getSystemDefault("HADOOP_CMD", "rhadoop.cmd", ""), "Usually 
/usr/bin/hadoop")
-.add("rhadooop.streamingjar", 
SparkInterpreter.getSystemDefault("HADOOP_STREAMING", "rhadooop.streamingjar", 
""), "Usually /usr/lib/hadoop/contrib/streaming/hadoop-streaming-.jar")
-.add("rscala.debug",  
SparkInterpreter.getSystemDefault("RSCALA_DEBUG", "rscala.debug","false"), 
"Whether to turn on rScala debugging") // TEST:  Implemented but not tested
-.add("rscala.timeout",
SparkInterpreter.getSystemDefault("RSCALA_TIMEOUT", "rscala.timeout","60"), 
"Timeout for rScala") // TEST:  Implemented but not tested
+.add("rhadoop.cmd",  "HADOOP_CMD", "rhadoop.cmd", "", "Usually 
/usr/bin/hadoop")
+.add("rhadooop.streamingjar", "HADOOP_STREAMING", "rhadooop.streamingjar", 
"", "Usually /usr/lib/hadoop/contrib/streaming/hadoop-streaming-.jar")
+.add("rscala.debug",  "RSCALA_DEBUG", "rscala.debug","false", 
"Whether to turn on rScala debugging") // TEST:  Implemented but not tested
+.add("rscala.timeout","RSCALA_TIMEOUT", "rscala.timeout","60", 
"Timeout for rScala") // TEST:  Implemented but not tested
 .build
 
   def getProps() = {

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/223d225e/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
--
diff --git 
a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java 
b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
index e6ce17f..9a54912 100644
--- a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
+++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
@@ -49,6 +49,7 @@ import org.apache.spark.ui.jobs.JobProgressListener;
 import org.apache.zeppelin.interpreter.Interpreter;
 import org.apache.zeppelin.interpreter.InterpreterContext;
 import org.apache.zeppelin.interpreter.InterpreterException;
+import org.apache.zeppelin.interpreter.InterpreterProperty;
 import org.apache.zeppelin.interpreter.InterpreterResult;
 import org.apache.zeppelin.interpreter.InterpreterResult.Code;
 import