zeppelin git commit: ZEPPELIN-2942. Remove non-remote interpreter approach

2017-10-09 Thread zjffdu
Repository: zeppelin
Updated Branches:
  refs/heads/master e28712c48 -> 0c64d9ca6


ZEPPELIN-2942. Remove non-remote interpreter approach

### What is this PR for?

This PR is just trying to remove non-remote interpreter approach.

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

### Todos
* [ ] - Task

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

### How should this be tested?
Current test is passed

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

Author: Jeff Zhang 

Closes #2597 from zjffdu/ZEPPELIN-2942 and squashes the following commits:

42fe419 [Jeff Zhang] ZEPPELIN-2942. Remove non-remote interpreter approach


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

Branch: refs/heads/master
Commit: 0c64d9ca676e48a749db9879fa3cebc06eb78b54
Parents: e28712c
Author: Jeff Zhang 
Authored: Fri Sep 22 11:28:42 2017 +0800
Committer: Jeff Zhang 
Committed: Tue Oct 10 06:32:36 2017 +0800

--
 .../zeppelin/interpreter/InterpreterOption.java | 19 +
 .../interpreter/InterpreterInfoSaving.java  |  5 --
 .../interpreter/InterpreterSetting.java | 84 ++--
 .../interpreter/InterpreterSettingManager.java  |  2 +-
 .../interpreter/InterpreterSettingTest.java |  9 ---
 .../ManagedInterpreterGroupTest.java|  1 -
 .../remote/RemoteAngularObjectTest.java |  1 -
 .../RemoteInterpreterOutputTestStream.java  |  1 -
 .../remote/RemoteInterpreterTest.java   |  1 -
 .../zeppelin/scheduler/RemoteSchedulerTest.java |  1 -
 10 files changed, 10 insertions(+), 114 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0c64d9ca/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterOption.java
--
diff --git 
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterOption.java
 
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterOption.java
index 37a0d99..e8a9225 100644
--- 
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterOption.java
+++ 
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterOption.java
@@ -28,7 +28,8 @@ public class InterpreterOption {
   public static final transient String SCOPED = "scoped";
   public static final transient String ISOLATED = "isolated";
 
-  boolean remote;
+  // always set it as true, keep this field just for backward compatibility
+  boolean remote = true;
   String host = null;
   int port = -1;
 
@@ -77,14 +78,9 @@ public class InterpreterOption {
   }
 
   public InterpreterOption() {
-this(false);
   }
 
-  public InterpreterOption(boolean remote) {
-this(remote, SHARED, SHARED);
-  }
-
-  public InterpreterOption(boolean remote, String perUser, String perNote) {
+  public InterpreterOption(String perUser, String perNote) {
 if (perUser == null) {
   throw new NullPointerException("perUser can not be null.");
 }
@@ -92,7 +88,6 @@ public class InterpreterOption {
   throw new NullPointerException("perNote can not be null.");
 }
 
-this.remote = remote;
 this.perUser = perUser;
 this.perNote = perNote;
   }
@@ -112,14 +107,6 @@ public class InterpreterOption {
 return option;
   }
 
-  public boolean isRemote() {
-return remote;
-  }
-
-  public void setRemote(boolean remote) {
-this.remote = remote;
-  }
-
   public String getHost() {
 return host;
   }

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0c64d9ca/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterInfoSaving.java
--
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterInfoSaving.java
 
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterInfoSaving.java
index d7593d5..3d9c2c3 100644
--- 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterInfoSaving.java
+++ 
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterInfoSaving.java
@@ -63,11 +63,6 @@ public class InterpreterInfoSaving implements 
JsonSerializable {
 
   if (infoSaving != null && infoSaving.interpreterSettings != null) {
 for (InterpreterSetting interpreterSetting : 
infoSaving.interpreterSettings.values()) {
-  // Always use separate interpreter process
-  // While we decided to 

zeppelin git commit: [ZEPPELIN-2979] Fix links to zeppelin website in README

2017-10-09 Thread felixcheung
Repository: zeppelin
Updated Branches:
  refs/heads/master 3eeb2282b -> e28712c48


[ZEPPELIN-2979] Fix links to zeppelin website in README

### What is this PR for?
Fixes the broken links in the README under the sections "Install binary 
package" and "Build from Source" . Also changes http to https for all links to 
the zeppelin website

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

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

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

Author: Adriano Pagano 

Closes #2610 from a-pagano/ZEPPELIN-2979 and squashes the following commits:

970477f [Adriano Pagano] Fix links to zeppelin website in README


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

Branch: refs/heads/master
Commit: e28712c48dcb22af3bf586c223941062cc85b1d1
Parents: 3eeb228
Author: Adriano Pagano 
Authored: Fri Oct 6 16:17:21 2017 +0200
Committer: Felix Cheung 
Committed: Mon Oct 9 09:44:45 2017 -0700

--
 README.md | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e28712c4/README.md
--
diff --git a/README.md b/README.md
index e12d2ae..126520a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Apache Zeppelin
 
-**Documentation:** [User 
Guide](http://zeppelin.apache.org/docs/latest/index.html)
-**Mailing Lists:** [User and Dev mailing 
list](http://zeppelin.apache.org/community.html)
+**Documentation:** [User 
Guide](https://zeppelin.apache.org/docs/latest/index.html)
+**Mailing Lists:** [User and Dev mailing 
list](https://zeppelin.apache.org/community.html)
 **Continuous Integration:** [![Build 
Status](https://travis-ci.org/apache/zeppelin.svg?branch=master)](https://travis-ci.org/apache/zeppelin)
 
 **Contributing:** [Contribution 
Guide](https://zeppelin.apache.org/contribution/contributions.html)
 **Issue Tracker:** [Jira](https://issues.apache.org/jira/browse/ZEPPELIN)
@@ -15,15 +15,15 @@ Core feature:
* Built-in Apache Spark support
 
 
-To know more about Zeppelin, visit our web site 
[http://zeppelin.apache.org](http://zeppelin.apache.org)
+To know more about Zeppelin, visit our web site 
[http://zeppelin.apache.org](https://zeppelin.apache.org)
 
 
 ## Getting Started
 
 ### Install binary package
-Please go to 
[install](http://zeppelin.apache.org/docs/snapshot/install/install.html) to 
install Apache Zeppelin from binary package.
+Please go to 
[install](https://zeppelin.apache.org/docs/latest/install/install.html) to 
install Apache Zeppelin from binary package.
 
 ### Build from source
-Please check [Build from 
source](http://zeppelin.apache.org/docs/snapshot/install/build.html) to build 
Zeppelin from source.
+Please check [Build from 
source](https://zeppelin.apache.org/docs/latest/install/build.html) to build 
Zeppelin from source.