Fixed conflict while rebasing.

jongyoul · jongyoul · commit 0a73241ea754 · 2016-10-19T15:08:24.000+09:00
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java
@@ -472,7 +472,7 @@ public void runAll() {
         AuthenticationInfo authenticationInfo = new AuthenticationInfo();
         authenticationInfo.setUser(cronExecutingUser);
         p.setAuthenticationInfo(authenticationInfo);
-        run(cronExecutingUser, p.getId());
+        run(p.getId());
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -472,7 +472,7 @@ public void runAll() {`
`472`	`472`	`AuthenticationInfo authenticationInfo = new AuthenticationInfo();`
`473`	`473`	`authenticationInfo.setUser(cronExecutingUser);`
`474`	`474`	`p.setAuthenticationInfo(authenticationInfo);`
`475`		`- run(cronExecutingUser, p.getId());`
	`475`	`+ run(p.getId());`
`476`	`476`	`}`
`477`	`477`	`}`
`478`	`478`	`}`