zeppelin git commit: HOT FIX: Fix NPE while getting default interpreter setting

2016-11-22 Thread moon 
Repository: zeppelin
Updated Branches:
  refs/heads/master 4dd36bfa3 -> 7f6f739ae


HOT FIX: Fix NPE while getting default interpreter setting

### What is this PR for?
NPE while starting Zeppelin for the first time without interpreter settings

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

### What is the Jira issue?
n/a

### How should this be tested?
remove conf/interpreter.json and start Zeppelin

### Logs
**Before**
`
java.lang.NullPointerException
at 
org.apache.zeppelin.interpreter.InterpreterFactory.getEditorSetting(InterpreterFactory.java:1385)
at 
org.apache.zeppelin.socket.NotebookServer.getEditorSetting(NotebookServer.java:1796)
at 
org.apache.zeppelin.socket.NotebookServer.onMessage(NotebookServer.java:290)
at 
org.apache.zeppelin.socket.NotebookSocket.onWebSocketText(NotebookSocket.java:59)
at 
org.eclipse.jetty.websocket.common.events.JettyListenerEventDriver.onTextMessage(JettyListenerEventDriver.java:128)
at 
org.eclipse.jetty.websocket.common.message.SimpleTextMessage.messageComplete(SimpleTextMessage.java:69)
at 
org.eclipse.jetty.websocket.common.events.AbstractEventDriver.appendMessage(AbstractEventDriver.java:65)
at 
org.eclipse.jetty.websocket.common.events.JettyListenerEventDriver.onTextFrame(JettyListenerEventDriver.java:122)
at 
org.eclipse.jetty.websocket.common.events.AbstractEventDriver.incomingFrame(AbstractEventDriver.java:161)
at 
org.eclipse.jetty.websocket.common.WebSocketSession.incomingFrame(WebSocketSession.java:309)
at 
org.eclipse.jetty.websocket.common.extensions.ExtensionStack.incomingFrame(ExtensionStack.java:214)
at 
org.eclipse.jetty.websocket.common.Parser.notifyFrame(Parser.java:220)
at org.eclipse.jetty.websocket.common.Parser.parse(Parser.java:258)
at 
org.eclipse.jetty.websocket.common.io.AbstractWebSocketConnection.readParse(AbstractWebSocketConnection.java:632)
at 
org.eclipse.jetty.websocket.common.io.AbstractWebSocketConnection.onFillable(AbstractWebSocketConnection.java:480)
at 
org.eclipse.jetty.io.AbstractConnection$2.run(AbstractConnection.java:544)
at 
org.eclipse.jetty.util.thread.QueuedThreadPool.runJob(QueuedThreadPool.java:635)
at 
org.eclipse.jetty.util.thread.QueuedThreadPool$3.run(QueuedThreadPool.java:555)
at java.lang.Thread.run(Thread.java:745)
`

**After**
`
 WARN [2016-11-22 18:52:16,890] ({qtp1702660825-60} 
InterpreterFactory.java[getEditorSetting]:1405) - Couldn't get interpreter 
editor setting
`

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

Author: Renjith Kamath 

Closes #1669 from r-kamath/npe-interpreter-setting and squashes the following 
commits:

e162689 [Renjith Kamath] Fix NPE while getting default interpreter setting


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

Branch: refs/heads/master
Commit: 7f6f739ae396e07de573bea4ef16a388c54e77b8
Parents: 4dd36bf
Author: Renjith Kamath 
Authored: Tue Nov 22 18:57:33 2016 +0530
Committer: Lee moon soo 
Committed: Tue Nov 22 12:16:14 2016 -0800

--
 .../java/org/apache/zeppelin/interpreter/InterpreterFactory.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7f6f739a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
--
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
 
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
index 1b46ca4..4564e3a 100644
--- 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
+++ 
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
@@ -1382,9 +1382,9 @@ public class InterpreterFactory implements 
InterpreterGroupFactory {
   public Map getEditorSetting(String user, String noteId, 
String replName) {
 Interpreter intp = getInterpreter(user, noteId, replName);
 Map editor = DEFAULT_EDITOR;
-String defaultSettingName = getDefaultInterpreterSetting(noteId).getName();
 String group = StringUtils.EMPTY;
 try {
+  String defaultSettingName = 
getDefaultInterpreterSetting(noteId).getName();
   List intpSettings = getInterpreterSettings(noteId);
   for (InterpreterSetting intpSetting : intpSettings) {

zeppelin git commit: [ZEPPELIN-1623] Fix flaky test - testEditOnDoubleClick

2016-11-22 Thread minalee 
Repository: zeppelin
Updated Branches:
  refs/heads/master 0bcbfb922 -> 4dd36bfa3


[ZEPPELIN-1623] Fix flaky test - testEditOnDoubleClick

### What is this PR for?
#1657 is merged, but CI failure still exists on master. Check [this 
link](https://issues.apache.org/jira/browse/ZEPPELIN-1623) to see the test 
failure.
I will trigger this PR 5 times and attach CI link on comments if all of them 
pass to be sure that the issue is gone.

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

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

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

Author: Mina Lee 

Closes #1667 from minahlee/ZEPPELIN-1623 and squashes the following commits:

ba750a4 [Mina Lee] Fix testEditOnDoubleClick flaky test


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

Branch: refs/heads/master
Commit: 4dd36bfa312285a13347fb15beadcb0baa30ed23
Parents: 0bcbfb9
Author: Mina Lee 
Authored: Mon Nov 21 22:48:04 2016 +0100
Committer: Mina Lee 
Committed: Tue Nov 22 15:04:24 2016 +0100

--
 .../org/apache/zeppelin/integration/ParagraphActionsIT.java   | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4dd36bfa/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java
--
diff --git 
a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java
 
b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java
index 6cf46ec..79e1d79 100644
--- 
a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java
+++ 
b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java
@@ -439,9 +439,10 @@ public class ParagraphActionsIT extends AbstractZeppelinIT 
{
   Actions action = new Actions(driver);
 
   waitForParagraph(1, "READY");
-  pollingWait(By.xpath(getParagraphXPath(1) + "//textarea"), 
MAX_PARAGRAPH_TIMEOUT_SEC);
-  driver.findElement(By.xpath(getParagraphXPath(1) + 
"//textarea")).sendKeys(Keys.SHIFT + "5");
-  driver.findElement(By.xpath(getParagraphXPath(1) + 
"//textarea")).sendKeys("md" + Keys.ENTER);
+
+  setTextOfParagraph(1, "%md");
+  driver.findElement(By.xpath(getParagraphXPath(1) + 
"//textarea")).sendKeys(Keys.ARROW_RIGHT);
+  driver.findElement(By.xpath(getParagraphXPath(1) + 
"//textarea")).sendKeys(Keys.ENTER);
   driver.findElement(By.xpath(getParagraphXPath(1) + 
"//textarea")).sendKeys(Keys.SHIFT + "3");
   driver.findElement(By.xpath(getParagraphXPath(1) + 
"//textarea")).sendKeys(" abc");

zeppelin git commit: [ZEPPELIN-1689] enable Power architecture

2016-11-22 Thread bzz 
Repository: zeppelin
Updated Branches:
  refs/heads/master de4049725 -> 0bcbfb922


[ZEPPELIN-1689] enable Power architecture

### What is this PR for?
A few sentences describing the overall goals of the pull request's commits.

this patch is platform independent and should not effect Intel architecture. We 
are simply upgrading the version of fronend-maven-plugin, nodejs, 
phantomjs-launcher to versions that are supported by Power architecture as well.

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

### Todos
* [ ] - Task

### What is the Jira issue?

https://issues.apache.org/jira/browse/ZEPPELIN-1689

### How should this be tested?
should test on x86 for any regression, highly unlikely.
OpenPOWER foundation team has already verified the patch on Power as part of 
Apache Bigtop project.

### Screenshots (if appropriate)

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

Author: amir sanjar 

Closes #1666 from asanjar/master and squashes the following commits:

2f92845 [amir sanjar] ZEPPELIN-1689: enable Power architecture


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

Branch: refs/heads/master
Commit: 0bcbfb922ed35940f36765758f6615c99f5afa7d
Parents: de40497
Author: amir sanjar 
Authored: Mon Nov 21 12:12:47 2016 -0600
Committer: Alexander Bezzubov 
Committed: Tue Nov 22 09:44:35 2016 +0100

--
 zeppelin-web/package.json | 2 +-
 zeppelin-web/pom.xml  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0bcbfb92/zeppelin-web/package.json
--
diff --git a/zeppelin-web/package.json b/zeppelin-web/package.json
index 73a374f..fc51573 100644
--- a/zeppelin-web/package.json
+++ b/zeppelin-web/package.json
@@ -36,7 +36,7 @@
 "karma": "~0.12.23",
 "karma-coverage": "^0.5.1",
 "karma-jasmine": "~0.1.5",
-"karma-phantomjs-launcher": "~0.1.4",
+"karma-phantomjs-launcher": "~1.0.0",
 "load-grunt-tasks": "^0.4.0",
 "time-grunt": "^0.3.1"
   },

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0bcbfb92/zeppelin-web/pom.xml
--
diff --git a/zeppelin-web/pom.xml b/zeppelin-web/pom.xml
index 8e7f7cd..e5dee60 100644
--- a/zeppelin-web/pom.xml
+++ b/zeppelin-web/pom.xml
@@ -90,7 +90,7 @@
   
 com.github.eirslett
 frontend-maven-plugin
-0.0.25
+1.1
 
 
   
@@ -99,7 +99,7 @@
   install-node-and-npm
 
 
-  v0.12.13
+  v4.4.7
   2.15.0