zeppelin git commit: [ZEPPELIN-675] "No data available" in invalid graph types for sql queries
Repository: zeppelin Updated Branches: refs/heads/master cf1f872e4 -> f236f1ccd [ZEPPELIN-675] "No data available" in invalid graph types for sql queries ### What is this PR for? Overriding graph message 'No data available' to 'Invalid Data, check graph settings' ### What type of PR is it? Improvement ### Todos * For Table and Map in graphs 'No data available' message is not shown, Maybe we want to implement this. ### What is the Jira issue? [ZEPPELIN-675] "No data available" in invalid graph types for sql queries ### How should this be tested? Step 1: Run a sql query which will return 1 column or no records. Step 2: Choose pie chart / bar chart Verification: Earlier the message is "No data available", It should have been changed to 'Invalid Data, check graph settings' ### 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: Naveen SubramanianCloses #1510 from snaveenp/ZEPPELIN-675-NoDataAvailable-in-graph and squashes the following commits: 75494a1 [Naveen Subramanian] Added custom message for no data in graph Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/f236f1cc Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/f236f1cc Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/f236f1cc Branch: refs/heads/master Commit: f236f1ccd3fef31370a350d72d4c757c6749f446 Parents: cf1f872 Author: Naveen Subramanian Authored: Thu Oct 13 12:42:27 2016 +0530 Committer: Damien CORNEAU Committed: Sun Oct 30 10:15:13 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/f236f1cc/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 8fa1876..141b059 100644 --- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js +++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js @@ -1107,6 +1107,7 @@ var setD3Chart = function(type, data, refresh) { if (!$scope.chart[type]) { var chart = nv.models[type](); +chart._options.noData = 'Invalid Data, check graph settings'; $scope.chart[type] = chart; } @@ -1123,7 +1124,6 @@ $scope.chart[type].xAxis.tickFormat(function(d) {return xAxisTickFormat(d, xLabels);}); $scope.chart[type].yAxis.tickFormat(function(d) {return yAxisTickFormat(d, yLabels);}); - // configure how the tooltip looks. $scope.chart[type].tooltipContent(function(key, x, y, graph, data) { var tooltipContent = '' + key + '';
zeppelin git commit: Fix version of cachebust
Repository: zeppelin Updated Branches: refs/heads/branch-0.6 ecc9214f1 -> e14b80b65 Fix version of cachebust ### What is this PR for? A dependency update of grunt-cache-bust is breaking the build. https://github.com/hollandben/grunt-cache-bust/issues/204 So fixing the dependency version ### What type of PR is it? Hot Fix ### Screenshot (before) ![screen shot 2016-10-06 at 12 22 40 pm](https://cloud.githubusercontent.com/assets/710411/19139450/bcad1494-8bbf-11e6-8b22-b9344055e876.png) ### How should this be tested? Clean your repo, and do mvn package in zeppelin-web ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Damien CORNEAU <cornead...@gmail.com> Closes #1491 from corneadoug/fix/cacheBust and squashes the following commits: 81e26a5 [Damien CORNEAU] Fix version of cachebust (cherry picked from commit 36c9f1a217c62778ab8212bd8ac5354a790a31ea) Signed-off-by: Damien CORNEAU <cornead...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/e14b80b6 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/e14b80b6 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/e14b80b6 Branch: refs/heads/branch-0.6 Commit: e14b80b651239960f66bb11c92b9c38d56da3a7a Parents: ecc9214 Author: Damien CORNEAU <cornead...@gmail.com> Authored: Thu Oct 6 11:56:34 2016 +0900 Committer: Damien CORNEAU <cornead...@gmail.com> Committed: Thu Oct 6 14:36:56 2016 +0900 -- zeppelin-web/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e14b80b6/zeppelin-web/package.json -- diff --git a/zeppelin-web/package.json b/zeppelin-web/package.json index d8081ed..fe1c9f6 100644 --- a/zeppelin-web/package.json +++ b/zeppelin-web/package.json @@ -9,7 +9,7 @@ "autoprefixer": "^6.1.0", "bower": "1.7.2", "grunt": "^0.4.1", -"grunt-cache-bust": "^1.3.0", +"grunt-cache-bust": "1.3.0", "grunt-cli": "^0.1.13", "grunt-concurrent": "^0.5.0", "grunt-contrib-clean": "^0.5.0",
[1/3] zeppelin git commit: [Zeppelin-1496] Apply Zeppelin-Web Good Practice Guide #1 to the code
Repository: zeppelin Updated Branches: refs/heads/master 23a7e1b45 -> a9e7bc381 http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a9e7bc38/zeppelin-web/src/app/search/result-list.controller.js -- diff --git a/zeppelin-web/src/app/search/result-list.controller.js b/zeppelin-web/src/app/search/result-list.controller.js index cc07a99..5472ebc 100644 --- a/zeppelin-web/src/app/search/result-list.controller.js +++ b/zeppelin-web/src/app/search/result-list.controller.js @@ -12,11 +12,13 @@ * limitations under the License. */ 'use strict'; +(function() { -angular - .module('zeppelinWebApp') - .controller('SearchResultCtrl', function($scope, $routeParams, searchService) { + angular.module('zeppelinWebApp').controller('SearchResultCtrl', SearchResultCtrl); + SearchResultCtrl.$inject = ['$scope', '$routeParams', 'searchService']; + + function SearchResultCtrl($scope, $routeParams, searchService) { $scope.isResult = true ; $scope.searchTerm = $routeParams.searchTerm; var results = searchService.search({'q': $routeParams.searchTerm}).query(); @@ -152,4 +154,6 @@ angular }; }; - }); + } + +})(); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a9e7bc38/zeppelin-web/src/components/arrayOrderingSrv/arrayOrdering.service.js -- diff --git a/zeppelin-web/src/components/arrayOrderingSrv/arrayOrdering.service.js b/zeppelin-web/src/components/arrayOrderingSrv/arrayOrdering.service.js index 00f827b..3f7d1b8 100644 --- a/zeppelin-web/src/components/arrayOrderingSrv/arrayOrdering.service.js +++ b/zeppelin-web/src/components/arrayOrderingSrv/arrayOrdering.service.js @@ -12,21 +12,24 @@ * limitations under the License. */ 'use strict'; +(function() { -angular.module('zeppelinWebApp').service('arrayOrderingSrv', function() { + angular.module('zeppelinWebApp').service('arrayOrderingSrv', arrayOrderingSrv); - var arrayOrderingSrv = this; + function arrayOrderingSrv() { +var arrayOrderingSrv = this; - this.notebookListOrdering = function(note) { -return arrayOrderingSrv.getNoteName(note); - }; +this.notebookListOrdering = function(note) { + return arrayOrderingSrv.getNoteName(note); +}; - this.getNoteName = function(note) { -if (note.name === undefined || note.name.trim() === '') { - return 'Note ' + note.id; -} else { - return note.name; -} - }; +this.getNoteName = function(note) { + if (note.name === undefined || note.name.trim() === '') { +return 'Note ' + note.id; + } else { +return note.name; + } +}; + } -}); +})(); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a9e7bc38/zeppelin-web/src/components/baseUrl/baseUrl.service.js -- diff --git a/zeppelin-web/src/components/baseUrl/baseUrl.service.js b/zeppelin-web/src/components/baseUrl/baseUrl.service.js index 656df63..8452a93 100644 --- a/zeppelin-web/src/components/baseUrl/baseUrl.service.js +++ b/zeppelin-web/src/components/baseUrl/baseUrl.service.js @@ -12,36 +12,41 @@ * limitations under the License. */ 'use strict'; +(function() { -angular.module('zeppelinWebApp').service('baseUrlSrv', function() { + angular.module('zeppelinWebApp').service('baseUrlSrv', baseUrlSrv); - this.getPort = function() { -var port = Number(location.port); -if (!port) { - port = 80; - if (location.protocol === 'https:') { -port = 443; + function baseUrlSrv() { +this.getPort = function() { + var port = Number(location.port); + if (!port) { +port = 80; +if (location.protocol === 'https:') { + port = 443; +} } -} -//Exception for when running locally via grunt -if (port === || port === 9000) { - port = 8080; -} -return port; - }; + //Exception for when running locally via grunt + if (port === || port === 9000) { +port = 8080; + } + return port; +}; - this.getWebsocketUrl = function() { -var wsProtocol = location.protocol === 'https:' ? 'wss:' : 'ws:'; -return wsProtocol + '//' + location.hostname + ':' + this.getPort() + skipTrailingSlash(location.pathname) + '/ws'; - }; +this.getWebsocketUrl = function() { + var wsProtocol = location.protocol === 'https:' ? 'wss:' : 'ws:'; + return wsProtocol + '//' + location.hostname + ':' + this.getPort() + + skipTrailingSlash(location.pathname) + '/ws'; +}; - this.getRestApiBase = function() { -return location.protocol + '//' + location.hostname + ':' + this.getPort() + skipTrailingSlash(location.pathname) + - '/api'; - }; +this.getRestApiBase = function() { + return location.protocol + '//' + location.hostname + ':' + + this.getPort() + skipTrailingSlash(location.pathname) +
[2/3] zeppelin git commit: [Zeppelin-1496] Apply Zeppelin-Web Good Practice Guide #1 to the code
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a9e7bc38/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 971f515..6eaba82 100644 --- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js +++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js @@ -12,2740 +12,2762 @@ * limitations under the License. */ 'use strict'; +(function() { + + angular.module('zeppelinWebApp').controller('ParagraphCtrl', ParagraphCtrl); + + ParagraphCtrl.$inject = [ +'$scope', +'$rootScope', +'$route', +'$window', +'$routeParams', +'$location', +'$timeout', +'$compile', +'$http', +'$q', +'websocketMsgSrv', +'baseUrlSrv', +'ngToast', +'saveAsService', +'esriLoader' + ]; + + function ParagraphCtrl($scope, $rootScope, $route, $window, $routeParams, $location, + $timeout, $compile, $http, $q, websocketMsgSrv, + baseUrlSrv, ngToast, saveAsService, esriLoader) { +var ANGULAR_FUNCTION_OBJECT_NAME_PREFIX = '_Z_ANGULAR_FUNC_'; +$scope.parentNote = null; +$scope.paragraph = null; +$scope.originalText = ''; +$scope.editor = null; +$scope.magic = null; + +var paragraphScope = $rootScope.$new(true, $rootScope); + +// to keep backward compatibility +$scope.compiledScope = paragraphScope; + +paragraphScope.z = { + // z.runParagraph('20150213-231621_168813393') + runParagraph: function(paragraphId) { +if (paragraphId) { + var filtered = $scope.parentNote.paragraphs.filter(function(x) { +return x.id === paragraphId;}); + if (filtered.length === 1) { +var paragraph = filtered[0]; +websocketMsgSrv.runParagraph(paragraph.id, paragraph.title, paragraph.text, +paragraph.config, paragraph.settings.params); + } else { +ngToast.danger({content: 'Cannot find a paragraph with id \'' + paragraphId + '\'', + verticalPosition: 'top', dismissOnTimeout: false}); + } +} else { + ngToast.danger({ +content: 'Please provide a \'paragraphId\' when calling z.runParagraph(paragraphId)', +verticalPosition: 'top', dismissOnTimeout: false}); +} + }, -angular.module('zeppelinWebApp').controller('ParagraphCtrl', function($scope, $rootScope, $route, $window, - $routeParams, $location, $timeout, $compile, - $http, $q, websocketMsgSrv, baseUrlSrv, ngToast, - saveAsService, esriLoader) { - var ANGULAR_FUNCTION_OBJECT_NAME_PREFIX = '_Z_ANGULAR_FUNC_'; - $scope.parentNote = null; - $scope.paragraph = null; - $scope.originalText = ''; - $scope.editor = null; - $scope.magic = null; - - var paragraphScope = $rootScope.$new(true, $rootScope); - - // to keep backward compatibility - $scope.compiledScope = paragraphScope; - - paragraphScope.z = { -// z.runParagraph('20150213-231621_168813393') -runParagraph: function(paragraphId) { - if (paragraphId) { -var filtered = $scope.parentNote.paragraphs.filter(function(x) { - return x.id === paragraphId;}); -if (filtered.length === 1) { - var paragraph = filtered[0]; - websocketMsgSrv.runParagraph(paragraph.id, paragraph.title, paragraph.text, - paragraph.config, paragraph.settings.params); + // Example: z.angularBind('my_var', 'Test Value', '20150213-231621_168813393') + angularBind: function(varName, value, paragraphId) { +// Only push to server if there paragraphId is defined +if (paragraphId) { + websocketMsgSrv.clientBindAngularObject($routeParams.noteId, varName, value, paragraphId); } else { - ngToast.danger({content: 'Cannot find a paragraph with id \'' + paragraphId + '\'', + ngToast.danger({ +content: 'Please provide a \'paragraphId\' when calling ' + +'z.angularBind(varName, value, \'PUT_HERE_PARAGRAPH_ID\')', +verticalPosition: 'top', dismissOnTimeout: false}); +} + }, + + // Example: z.angularUnBind('my_var', '20150213-231621_168813393') + angularUnbind: function(varName, paragraphId) { +// Only push to server if paragraphId is defined +if (paragraphId) { + websocketMsgSrv.clientUnbindAngularObject($routeParams.noteId, varName, paragraphId); +} else { + ngToast.danger({ +content: 'Please provide a \'paragraphId\' when calling ' + +
zeppelin git commit: [ZEPPELIN-1502] Highlights initialization code editor bugs
Repository: zeppelin Updated Branches: refs/heads/master c3e05de8a -> 23a7e1b45 [ZEPPELIN-1502] Highlights initialization code editor bugs ### What is this PR for? When there are a variety of para graph interpreter present, When you refresh the page, the code highlights are incorrectly applied. ### What type of PR is it? Bug Fix ### Todos - [x] - Create orderId key in getEditorMode function. ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1502 ### How should this be tested? 1. Create a para-graph form below. ``` %spark println("spark syn 01"); ``` ``` %spark println("spark syn 02"); ``` ``` %spark println("spark syn 03"); ``` ``` %spark println("spark syn 04"); ``` ``` %spark println("spark syn 05"); ``` ``` %pyspark print ("pyspark syn); ``` ``` %sql SELECT * FROM SQL_HIGH WHERE ONMYCOM ``` 2. Check the highlights of each of the para graphs. 3. Refresh the page and check the highlights again. ### Screenshots (if appropriate) bug (focus on pyspark) ![codeeidtorhigh](https://cloud.githubusercontent.com/assets/10525473/18906890/66b8ede0-85a4-11e6-96fb-6cc000edf477.png) this pr (focus on pyspark) ![code](https://cloud.githubusercontent.com/assets/10525473/18907220/bcc9f818-85a5-11e6-949c-db94fa753d3c.png) ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: CloverHeartsCloses #1468 from cloverhearts/dev/codeeditor-bugfixed and squashes the following commits: ff43ce3 [CloverHearts] change payload key name for interpreter syntax property de03a06 [CloverHearts] remove whitespace - jslint eaa1b86 [CloverHearts] bug fixed for page refresh initialize editor mode Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/23a7e1b4 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/23a7e1b4 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/23a7e1b4 Branch: refs/heads/master Commit: 23a7e1b45c8845946746252c354f2da66febbbcc Parents: c3e05de Author: CloverHearts Authored: Thu Sep 29 14:14:03 2016 +0900 Committer: Damien CORNEAU Committed: Mon Oct 3 16:53:51 2016 +0900 -- .../main/java/org/apache/zeppelin/socket/NotebookServer.java | 2 ++ .../src/app/notebook/paragraph/paragraph.controller.js| 7 --- .../src/components/websocketEvents/websocketMsg.service.js| 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/23a7e1b4/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 b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java index 10c9410..ab7394b 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java @@ -1595,9 +1595,11 @@ public class NotebookServer extends WebSocketServlet implements private void getEditorSetting(NotebookSocket conn, Message fromMessage) throws IOException { +String paragraphId = (String) fromMessage.get("paragraphId"); String replName = (String) fromMessage.get("magic"); String noteId = getOpenNoteId(conn); Message resp = new Message(OP.EDITOR_SETTING); +resp.put("paragraphId", paragraphId); resp.put("editor", notebook().getInterpreterFactory().getEditorSetting(noteId, replName)); conn.send(serializeMessage(resp)); return; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/23a7e1b4/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 824896a..971f515 100644 --- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js +++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js @@ -705,13 +705,14 @@ angular.module('zeppelinWebApp').controller('ParagraphCtrl', function($scope, $r var getAndSetEditorSetting = function(session, interpreterName) { var deferred = $q.defer(); -websocketMsgSrv.getEditorSetting(interpreterName); +websocketMsgSrv.getEditorSetting($scope.paragraph.id, interpreterName); $timeout( $scope.$on('editorSetting', function(event, data) { -deferred.resolve(data); +if ($scope.paragraph.id === data.paragraphId) { + deferred.resolve(data); +} } ), 1000); -
svn commit: r1763121 - in /zeppelin/site/docs/0.7.0-SNAPSHOT: ./ development/ displaysystem/ install/ interpreter/ manual/ quickstart/ rest-api/ security/ storage/
Author: corneadoug Date: Mon Oct 3 07:47:27 2016 New Revision: 1763121 URL: http://svn.apache.org/viewvc?rev=1763121=rev Log: Remove some files from search Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/atom.xml zeppelin/site/docs/0.7.0-SNAPSHOT/development/howtocontribute.html zeppelin/site/docs/0.7.0-SNAPSHOT/development/howtocontributewebsite.html zeppelin/site/docs/0.7.0-SNAPSHOT/development/writingzeppelinapplication.html zeppelin/site/docs/0.7.0-SNAPSHOT/development/writingzeppelininterpreter.html zeppelin/site/docs/0.7.0-SNAPSHOT/displaysystem/back-end-angular.html zeppelin/site/docs/0.7.0-SNAPSHOT/displaysystem/basicdisplaysystem.html zeppelin/site/docs/0.7.0-SNAPSHOT/displaysystem/front-end-angular.html zeppelin/site/docs/0.7.0-SNAPSHOT/index.html zeppelin/site/docs/0.7.0-SNAPSHOT/install/cdh.html zeppelin/site/docs/0.7.0-SNAPSHOT/install/install.html zeppelin/site/docs/0.7.0-SNAPSHOT/install/spark_cluster_mode.html zeppelin/site/docs/0.7.0-SNAPSHOT/install/upgrade.html zeppelin/site/docs/0.7.0-SNAPSHOT/install/virtual_machine.html zeppelin/site/docs/0.7.0-SNAPSHOT/install/yarn_install.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/alluxio.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/beam.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/bigquery.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/cassandra.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/elasticsearch.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/flink.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/geode.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/hbase.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/hdfs.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/hive.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/ignite.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/jdbc.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/lens.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/livy.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/markdown.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/postgresql.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/python.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/r.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/scalding.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/shell.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/spark.html zeppelin/site/docs/0.7.0-SNAPSHOT/manual/dependencymanagement.html zeppelin/site/docs/0.7.0-SNAPSHOT/manual/dynamicform.html zeppelin/site/docs/0.7.0-SNAPSHOT/manual/dynamicinterpreterload.html zeppelin/site/docs/0.7.0-SNAPSHOT/manual/interpreterinstallation.html zeppelin/site/docs/0.7.0-SNAPSHOT/manual/interpreters.html zeppelin/site/docs/0.7.0-SNAPSHOT/manual/notebookashomepage.html zeppelin/site/docs/0.7.0-SNAPSHOT/manual/publish.html zeppelin/site/docs/0.7.0-SNAPSHOT/pleasecontribute.html zeppelin/site/docs/0.7.0-SNAPSHOT/quickstart/explorezeppelinui.html zeppelin/site/docs/0.7.0-SNAPSHOT/quickstart/tutorial.html zeppelin/site/docs/0.7.0-SNAPSHOT/rest-api/rest-configuration.html zeppelin/site/docs/0.7.0-SNAPSHOT/rest-api/rest-credential.html zeppelin/site/docs/0.7.0-SNAPSHOT/rest-api/rest-interpreter.html zeppelin/site/docs/0.7.0-SNAPSHOT/rest-api/rest-notebook.html zeppelin/site/docs/0.7.0-SNAPSHOT/rss.xml zeppelin/site/docs/0.7.0-SNAPSHOT/screenshots.html zeppelin/site/docs/0.7.0-SNAPSHOT/search.html zeppelin/site/docs/0.7.0-SNAPSHOT/search_data.json zeppelin/site/docs/0.7.0-SNAPSHOT/security/authentication.html zeppelin/site/docs/0.7.0-SNAPSHOT/security/datasource_authorization.html zeppelin/site/docs/0.7.0-SNAPSHOT/security/notebook_authorization.html zeppelin/site/docs/0.7.0-SNAPSHOT/security/shiroauthentication.html zeppelin/site/docs/0.7.0-SNAPSHOT/sitemap.txt zeppelin/site/docs/0.7.0-SNAPSHOT/storage/storage.html Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/atom.xml URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/atom.xml?rev=1763121=1763120=1763121=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/atom.xml (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/atom.xml Mon Oct 3 07:47:27 2016 @@ -4,7 +4,7 @@ Apache Zeppelin http://zeppelin.apache.org/; rel="self"/> http://zeppelin.apache.org"/> - 2016-09-30T13:57:27+09:00 + 2016-10-03T16:30:05+09:00 http://zeppelin.apache.org The Apache Software Foundation Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/development/howtocontribute.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/development/howtocontribute.html?rev=1763121=1763120=1763121=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/development
[3/3] zeppelin git commit: Closes #47
Closes #47 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/7ef2e58c Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/7ef2e58c Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/7ef2e58c Branch: refs/heads/master Commit: 7ef2e58c748a59dc033980dc59183f465b9c24d6 Parents: 47fb853 Author: Damien CORNEAUAuthored: Mon Oct 3 16:14:26 2016 +0900 Committer: Damien CORNEAU Committed: Mon Oct 3 16:14:26 2016 +0900 -- --
[1/3] zeppelin git commit: Closes #152
Repository: zeppelin Updated Branches: refs/heads/master 3017730b8 -> 7ef2e58c7 Closes #152 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/39821848 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/39821848 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/39821848 Branch: refs/heads/master Commit: 39821848513889a5d532b8a43bfd98349247e2f3 Parents: 3017730 Author: Damien CORNEAUAuthored: Mon Oct 3 16:14:10 2016 +0900 Committer: Damien CORNEAU Committed: Mon Oct 3 16:14:10 2016 +0900 -- --
svn commit: r1762853 - in /zeppelin/site/docs/0.7.0-SNAPSHOT: atom.xml quickstart/install_with_flink_and_spark_cluster.html rss.xml search_data.json
Author: corneadoug Date: Fri Sep 30 04:58:26 2016 New Revision: 1762853 URL: http://svn.apache.org/viewvc?rev=1762853=rev Log: Fix Flink tutorial imaged Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/atom.xml zeppelin/site/docs/0.7.0-SNAPSHOT/quickstart/install_with_flink_and_spark_cluster.html zeppelin/site/docs/0.7.0-SNAPSHOT/rss.xml zeppelin/site/docs/0.7.0-SNAPSHOT/search_data.json Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/atom.xml URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/atom.xml?rev=1762853=1762852=1762853=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/atom.xml (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/atom.xml Fri Sep 30 04:58:26 2016 @@ -4,7 +4,7 @@ Apache Zeppelin http://zeppelin.apache.org/; rel="self"/> http://zeppelin.apache.org"/> - 2016-09-30T11:52:41+09:00 + 2016-09-30T13:57:27+09:00 http://zeppelin.apache.org The Apache Software Foundation Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/quickstart/install_with_flink_and_spark_cluster.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/quickstart/install_with_flink_and_spark_cluster.html?rev=1762853=1762852=1762853=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/quickstart/install_with_flink_and_spark_cluster.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/quickstart/install_with_flink_and_spark_cluster.html Fri Sep 30 04:58:26 2016 @@ -414,7 +414,7 @@ mvn clean install -DskipTests In a browser, navigate to http://yourip:8082 to see the Flink Web-UI. Click on Task Managers in the left navigation bar. Ensure there is at least one Task Manager present. - + If no task managers are present, restart the Flink cluster with the following commands: @@ -474,7 +474,7 @@ mvn clean package -DskipTests Open a browser and navigate to http://yourip:8082 to ensure the Spark master is running. - + Toward the top of the page there will be a URL: spark://yourhost:7077. Note this URL, the Spark Master URI, it will be needed in subsequent steps. Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/rss.xml URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/rss.xml?rev=1762853=1762852=1762853=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/rss.xml (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/rss.xml Fri Sep 30 04:58:26 2016 @@ -5,8 +5,8 @@ Apache Zeppelin - The Apache Software Foundation http://zeppelin.apache.org http://zeppelin.apache.org -2016-09-30T11:52:41+09:00 -2016-09-30T11:52:41+09:00 +2016-09-30T13:57:27+09:00 +2016-09-30T13:57:27+09:00 1800 Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/search_data.json URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/search_data.json?rev=1762853=1762852=1762853=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/search_data.json (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/search_data.json Fri Sep 30 04:58:26 2016 @@ -4,7 +4,7 @@ "/atom.xml": { "title": "Atom Feed", - "content" : " Apache Zeppelin 2016-09-30T11:52:41+09:00 http://zeppelin.apache.orgThe Apache Software Foundation d...@zeppelin.apache.org ", + "content" : " Apache Zeppelin 2016-09-30T13:57:27+09:00 http://zeppelin.apache.orgThe Apache Software Foundation d...@zeppelin.apache.org ", "url": " /atom.xml", "group": "", "excerpt": "" @@ -545,7 +545,7 @@ "/rss.xml": { "title": "RSS Feed", - "content" : "Apache ZeppelinApache Zeppelin - The Apache Software Foundationhttp://zeppelin.apache.org http://zeppelin.apache.org2016-09-30T11:52:41+09:00 2016-09-30T11:52:41+09:001800", + "content" : "Apache ZeppelinApache Zeppelin - The Apache Software Foundationhttp://zeppelin.apache.org http://zeppelin.apache.org2016-09-30T13:57:27+09:00 2016-09-30T13:57:27+09:001800", "url": " /rss.xml", "group": "", "excerpt": ""
zeppelin git commit: Change path to tutorial images
Repository: zeppelin Updated Branches: refs/heads/master b92ed6cd8 -> 15a6ee520 Change path to tutorial images ### What is this PR for? Fixing the image path of the tutorial made in #418 ### What type of PR is it? Hot Fix ### What is the Jira issue? None, just a Hotfix ### How should this be tested? Build, move into full website, you should see the images ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Damien CORNEAU <cornead...@gmail.com> Closes #1474 from corneadoug/fix/FlinkTutorialImg and squashes the following commits: cabd8df [Damien CORNEAU] Change path to tutorial images Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/15a6ee52 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/15a6ee52 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/15a6ee52 Branch: refs/heads/master Commit: 15a6ee5208ab7a209ca98474ca24e98fb63df130 Parents: b92ed6c Author: Damien CORNEAU <cornead...@gmail.com> Authored: Fri Sep 30 12:05:18 2016 +0900 Committer: Damien CORNEAU <cornead...@gmail.com> Committed: Fri Sep 30 13:56:00 2016 +0900 -- docs/quickstart/install_with_flink_and_spark_cluster.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/15a6ee52/docs/quickstart/install_with_flink_and_spark_cluster.md -- diff --git a/docs/quickstart/install_with_flink_and_spark_cluster.md b/docs/quickstart/install_with_flink_and_spark_cluster.md index b7aad13..e653c77 100644 --- a/docs/quickstart/install_with_flink_and_spark_cluster.md +++ b/docs/quickstart/install_with_flink_and_spark_cluster.md @@ -284,7 +284,7 @@ build-target/bin/start-cluster.sh In a browser, navigate to http://`yourip`:8082 to see the Flink Web-UI. Click on 'Task Managers' in the left navigation bar. Ensure there is at least one Task Manager present. -![alt text](../../assets/themes/zeppelin/img/screenshots/flink-webui.png "The Flink Web-UI") +![alt text](../assets/themes/zeppelin/img/screenshots/flink-webui.png "The Flink Web-UI") If no task managers are present, restart the Flink cluster with the following commands: @@ -362,7 +362,7 @@ spark/sbin/start-master.sh --webui-port 8082 Open a browser and navigate to http://`yourip`:8082 to ensure the Spark master is running. -![alt text](../../assets/themes/zeppelin/img/screenshots/spark-master-webui1.png "It should look like this...") +![alt text](../assets/themes/zeppelin/img/screenshots/spark-master-webui1.png "It should look like this...") Toward the top of the page there will be a *URL*: spark://`yourhost`:7077. Note this URL, the Spark Master URI, it will be needed in subsequent steps.
svn commit: r1762851 [2/2] - in /zeppelin/site/docs/0.7.0-SNAPSHOT: ./ assets/themes/zeppelin/img/screenshots/ development/ displaysystem/ install/ interpreter/ manual/ quickstart/ rest-api/ security/
Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/rest-api/rest-credential.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/rest-api/rest-credential.html?rev=1762851=1762850=1762851=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/rest-api/rest-credential.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/rest-api/rest-credential.html Fri Sep 30 03:00:45 2016 @@ -80,6 +80,7 @@ More Upgrade Zeppelin Version +Install Zeppelin with Flink and Spark Clusters Tutorial Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/rest-api/rest-interpreter.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/rest-api/rest-interpreter.html?rev=1762851=1762850=1762851=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/rest-api/rest-interpreter.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/rest-api/rest-interpreter.html Fri Sep 30 03:00:45 2016 @@ -80,6 +80,7 @@ More Upgrade Zeppelin Version +Install Zeppelin with Flink and Spark Clusters Tutorial Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/rest-api/rest-notebook.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/rest-api/rest-notebook.html?rev=1762851=1762850=1762851=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/rest-api/rest-notebook.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/rest-api/rest-notebook.html Fri Sep 30 03:00:45 2016 @@ -80,6 +80,7 @@ More Upgrade Zeppelin Version +Install Zeppelin with Flink and Spark Clusters Tutorial Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/rss.xml URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/rss.xml?rev=1762851=1762850=1762851=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/rss.xml (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/rss.xml Fri Sep 30 03:00:45 2016 @@ -5,8 +5,8 @@ Apache Zeppelin - The Apache Software Foundation http://zeppelin.apache.org http://zeppelin.apache.org -2016-09-29T21:23:46+09:00 -2016-09-29T21:23:46+09:00 +2016-09-30T11:52:41+09:00 +2016-09-30T11:52:41+09:00 1800 Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/screenshots.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/screenshots.html?rev=1762851=1762850=1762851=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/screenshots.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/screenshots.html Fri Sep 30 03:00:45 2016 @@ -80,6 +80,7 @@ More Upgrade Zeppelin Version +Install Zeppelin with Flink and Spark Clusters Tutorial Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/search.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/search.html?rev=1762851=1762850=1762851=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/search.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/search.html Fri Sep 30 03:00:45 2016 @@ -80,6 +80,7 @@ More Upgrade Zeppelin Version +Install Zeppelin with Flink and Spark Clusters Tutorial Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/search_data.json URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/search_data.json?rev=1762851=1762850=1762851=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/search_data.json (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/search_data.json Fri Sep 30 03:00:45 2016 @@ -4,7 +4,7 @@ "/atom.xml": { "title": "Atom Feed", - "content" : " Apache Zeppelin 2016-09-29T21:23:46+09:00 http://zeppelin.apache.orgThe Apache Software Foundation d...@zeppelin.apache.org ", + "content" : " Apache Zeppelin 2016-09-30T11:52:41+09:00 http://zeppelin.apache.orgThe Apache Software Foundation d...@zeppelin.apache.org ", "url": " /atom.xml", "group": "", "excerpt": "" @@ -477,6 +477,17 @@ +"/quickstart/install_with_flink_and_spark_cluster.html": { + "title": "Install Zeppelin with Flink and Spark in cluster mode", + "content" : "!--Licensed
svn commit: r1762851 [1/2] - in /zeppelin/site/docs/0.7.0-SNAPSHOT: ./ assets/themes/zeppelin/img/screenshots/ development/ displaysystem/ install/ interpreter/ manual/ quickstart/ rest-api/ security/
Author: corneadoug Date: Fri Sep 30 03:00:45 2016 New Revision: 1762851 URL: http://svn.apache.org/viewvc?rev=1762851=rev Log: Add Flink tutorial Added: zeppelin/site/docs/0.7.0-SNAPSHOT/assets/themes/zeppelin/img/screenshots/flink-webui.png (with props) zeppelin/site/docs/0.7.0-SNAPSHOT/assets/themes/zeppelin/img/screenshots/spark-master-webui1.png (with props) zeppelin/site/docs/0.7.0-SNAPSHOT/quickstart/install_with_flink_and_spark_cluster.html Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/atom.xml zeppelin/site/docs/0.7.0-SNAPSHOT/development/howtocontribute.html zeppelin/site/docs/0.7.0-SNAPSHOT/development/howtocontributewebsite.html zeppelin/site/docs/0.7.0-SNAPSHOT/development/writingzeppelinapplication.html zeppelin/site/docs/0.7.0-SNAPSHOT/development/writingzeppelininterpreter.html zeppelin/site/docs/0.7.0-SNAPSHOT/displaysystem/back-end-angular.html zeppelin/site/docs/0.7.0-SNAPSHOT/displaysystem/basicdisplaysystem.html zeppelin/site/docs/0.7.0-SNAPSHOT/displaysystem/front-end-angular.html zeppelin/site/docs/0.7.0-SNAPSHOT/index.html zeppelin/site/docs/0.7.0-SNAPSHOT/install/cdh.html zeppelin/site/docs/0.7.0-SNAPSHOT/install/install.html zeppelin/site/docs/0.7.0-SNAPSHOT/install/spark_cluster_mode.html zeppelin/site/docs/0.7.0-SNAPSHOT/install/upgrade.html zeppelin/site/docs/0.7.0-SNAPSHOT/install/virtual_machine.html zeppelin/site/docs/0.7.0-SNAPSHOT/install/yarn_install.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/alluxio.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/beam.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/bigquery.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/cassandra.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/elasticsearch.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/flink.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/geode.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/hbase.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/hdfs.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/hive.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/ignite.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/jdbc.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/lens.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/livy.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/markdown.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/postgresql.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/python.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/r.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/scalding.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/shell.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/spark.html zeppelin/site/docs/0.7.0-SNAPSHOT/manual/dependencymanagement.html zeppelin/site/docs/0.7.0-SNAPSHOT/manual/dynamicform.html zeppelin/site/docs/0.7.0-SNAPSHOT/manual/dynamicinterpreterload.html zeppelin/site/docs/0.7.0-SNAPSHOT/manual/interpreterinstallation.html zeppelin/site/docs/0.7.0-SNAPSHOT/manual/interpreters.html zeppelin/site/docs/0.7.0-SNAPSHOT/manual/notebookashomepage.html zeppelin/site/docs/0.7.0-SNAPSHOT/manual/publish.html zeppelin/site/docs/0.7.0-SNAPSHOT/pleasecontribute.html zeppelin/site/docs/0.7.0-SNAPSHOT/quickstart/explorezeppelinui.html zeppelin/site/docs/0.7.0-SNAPSHOT/quickstart/tutorial.html zeppelin/site/docs/0.7.0-SNAPSHOT/rest-api/rest-configuration.html zeppelin/site/docs/0.7.0-SNAPSHOT/rest-api/rest-credential.html zeppelin/site/docs/0.7.0-SNAPSHOT/rest-api/rest-interpreter.html zeppelin/site/docs/0.7.0-SNAPSHOT/rest-api/rest-notebook.html zeppelin/site/docs/0.7.0-SNAPSHOT/rss.xml zeppelin/site/docs/0.7.0-SNAPSHOT/screenshots.html zeppelin/site/docs/0.7.0-SNAPSHOT/search.html zeppelin/site/docs/0.7.0-SNAPSHOT/search_data.json zeppelin/site/docs/0.7.0-SNAPSHOT/security/authentication.html zeppelin/site/docs/0.7.0-SNAPSHOT/security/datasource_authorization.html zeppelin/site/docs/0.7.0-SNAPSHOT/security/notebook_authorization.html zeppelin/site/docs/0.7.0-SNAPSHOT/security/shiroauthentication.html zeppelin/site/docs/0.7.0-SNAPSHOT/sitemap.txt zeppelin/site/docs/0.7.0-SNAPSHOT/storage/storage.html Added: zeppelin/site/docs/0.7.0-SNAPSHOT/assets/themes/zeppelin/img/screenshots/flink-webui.png URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/assets/themes/zeppelin/img/screenshots/flink-webui.png?rev=1762851=auto == Binary file - no diff available. Propchange: zeppelin/site/docs/0.7.0-SNAPSHOT/assets/themes/zeppelin/img/screenshots/flink-webui.png -- svn:mime-type = application/octet-stream Added: zeppelin/site/docs/0.7.0-SNAPSHOT/assets/themes/zeppelin/img
[1/4] zeppelin git commit: Closes #72
Repository: zeppelin Updated Branches: refs/heads/master 523868ed8 -> b92ed6cd8 Closes #72 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/77018d14 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/77018d14 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/77018d14 Branch: refs/heads/master Commit: 77018d14e4d2f90e051f24ea0a7d375131e6b26d Parents: 523868e Author: Damien CORNEAUAuthored: Fri Sep 30 11:17:00 2016 +0900 Committer: Damien CORNEAU Committed: Fri Sep 30 11:17:00 2016 +0900 -- --
[3/4] zeppelin git commit: Closes #321
Closes #321 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/c0fc0a0d Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/c0fc0a0d Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/c0fc0a0d Branch: refs/heads/master Commit: c0fc0a0d8f9e11af16512c7ecf132ce249ee4e50 Parents: bae02fd Author: Damien CORNEAUAuthored: Fri Sep 30 11:17:20 2016 +0900 Committer: Damien CORNEAU Committed: Fri Sep 30 11:17:20 2016 +0900 -- --
[4/4] zeppelin git commit: Closes #336
Closes #336 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/b92ed6cd Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/b92ed6cd Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/b92ed6cd Branch: refs/heads/master Commit: b92ed6cd8e882f210f4b44f264ce0e6df4678c26 Parents: c0fc0a0 Author: Damien CORNEAUAuthored: Fri Sep 30 11:17:28 2016 +0900 Committer: Damien CORNEAU Committed: Fri Sep 30 11:17:28 2016 +0900 -- --
zeppelin git commit: [DOCS] Zeppelin Flink Spark tutorial
Repository: zeppelin Updated Branches: refs/heads/master c7ce709f3 -> 523868ed8 [DOCS] Zeppelin Flink Spark tutorial Moon recommended I migrate a How To tutorial I wrote into the website. http://mail-archives.apache.org/mod_mbox/incubator-zeppelin-users/201511.mbox/browser I didn't create a JIRA issue, it doesn't look like that is nessicary for website updates? If it is, I'm sorry I'll go make one. Sorry, I'm new. Author: rawkintrevoCloses #418 from rawkintrevo/zeppelin-flink-spark-tutorial and squashes the following commits: 0cd86b3 [rawkintrevo] [DOCS] Flink and Spark Cluster Tutorial Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/523868ed Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/523868ed Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/523868ed Branch: refs/heads/master Commit: 523868ed8daf2e7e7cefcf69b5924305e8d431b0 Parents: c7ce709 Author: rawkintrevo Authored: Wed Sep 28 22:59:11 2016 -0500 Committer: Damien CORNEAU Committed: Fri Sep 30 11:14:44 2016 +0900 -- docs/_includes/themes/zeppelin/_navigation.html | 1 + .../zeppelin/img/screenshots/flink-webui.png| Bin 0 -> 35725 bytes .../img/screenshots/spark-master-webui1.png | Bin 0 -> 26714 bytes .../install_with_flink_and_spark_cluster.md | 414 +++ 4 files changed, 415 insertions(+) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/523868ed/docs/_includes/themes/zeppelin/_navigation.html -- diff --git a/docs/_includes/themes/zeppelin/_navigation.html b/docs/_includes/themes/zeppelin/_navigation.html index 4a7e75b..a0e4485 100644 --- a/docs/_includes/themes/zeppelin/_navigation.html +++ b/docs/_includes/themes/zeppelin/_navigation.html @@ -33,6 +33,7 @@ More Upgrade Zeppelin Version +Install Zeppelin with Flink and Spark Clusters Tutorial http://git-wip-us.apache.org/repos/asf/zeppelin/blob/523868ed/docs/assets/themes/zeppelin/img/screenshots/flink-webui.png -- diff --git a/docs/assets/themes/zeppelin/img/screenshots/flink-webui.png b/docs/assets/themes/zeppelin/img/screenshots/flink-webui.png new file mode 100644 index 000..3fec8fe Binary files /dev/null and b/docs/assets/themes/zeppelin/img/screenshots/flink-webui.png differ http://git-wip-us.apache.org/repos/asf/zeppelin/blob/523868ed/docs/assets/themes/zeppelin/img/screenshots/spark-master-webui1.png -- diff --git a/docs/assets/themes/zeppelin/img/screenshots/spark-master-webui1.png b/docs/assets/themes/zeppelin/img/screenshots/spark-master-webui1.png new file mode 100644 index 000..5a4f028 Binary files /dev/null and b/docs/assets/themes/zeppelin/img/screenshots/spark-master-webui1.png differ http://git-wip-us.apache.org/repos/asf/zeppelin/blob/523868ed/docs/quickstart/install_with_flink_and_spark_cluster.md -- diff --git a/docs/quickstart/install_with_flink_and_spark_cluster.md b/docs/quickstart/install_with_flink_and_spark_cluster.md new file mode 100644 index 000..b7aad13 --- /dev/null +++ b/docs/quickstart/install_with_flink_and_spark_cluster.md @@ -0,0 +1,414 @@ +--- +layout: page +title: "Install Zeppelin with Flink and Spark in cluster mode" +description: "Tutorial is valid for Spark 1.6.x and Flink 1.1.2" +group: tutorial +--- + + +This tutorial is extremely entry-level. It assumes no prior knowledge of Linux, git, or other tools. If you carefully type what I tell you when I tell you, you should be able to get Zeppelin running. + +## Installing Zeppelin with Flink and Spark in cluster mode + +This tutorial assumes the user has a machine (real or [virtual](https://www.virtualbox.org/wiki/Downloads) with a fresh, minimal installation of [Ubuntu 14.04.3 Server](http://www.ubuntu.com/download/server). + +**Note:** On the size requirements of the Virtual Machine, some users reported trouble when using the default virtual machine sizes, specifically that the hard drive needed to be at least 16GB- other users did not have this issue. + +There are many good tutorials on how to install Ubuntu Server on a virtual box, [here is one of them](http://ilearnstack.com/2013/04/13/setting-ubuntu-vm-in-virtualbox/) + +### Required Programs + +Assuming the minimal install, there are several programs that we will need to install before Zeppelin, Flink, and Spark. + +- git +- openssh-server +- OpenJDK 7 +- Maven 3.1+ + +For git,
svn commit: r1762596 - in /zeppelin/site/contribution: ./ zeppelinweb/
Author: corneadoug Date: Wed Sep 28 01:44:12 2016 New Revision: 1762596 URL: http://svn.apache.org/viewvc?rev=1762596=rev Log: Add ZeppelinWeb GoodPracticeGuide 04 Added: zeppelin/site/contribution/zeppelinweb/goodPracticeGuide04.html Modified: zeppelin/site/contribution/contributions.html zeppelin/site/contribution/documentation.html zeppelin/site/contribution/webapplication.html zeppelin/site/contribution/zeppelinweb/goodPracticeGuide01.html zeppelin/site/contribution/zeppelinweb/goodPracticeGuide02.html zeppelin/site/contribution/zeppelinweb/goodPracticeGuide03.html Modified: zeppelin/site/contribution/contributions.html URL: http://svn.apache.org/viewvc/zeppelin/site/contribution/contributions.html?rev=1762596=1762595=1762596=diff == --- zeppelin/site/contribution/contributions.html (original) +++ zeppelin/site/contribution/contributions.html Wed Sep 28 01:44:12 2016 @@ -124,6 +124,12 @@ + + + + + + @@ -263,6 +269,12 @@ + + + + + + Modified: zeppelin/site/contribution/documentation.html URL: http://svn.apache.org/viewvc/zeppelin/site/contribution/documentation.html?rev=1762596=1762595=1762596=diff == --- zeppelin/site/contribution/documentation.html (original) +++ zeppelin/site/contribution/documentation.html Wed Sep 28 01:44:12 2016 @@ -124,6 +124,12 @@ + + + + + + @@ -263,6 +269,12 @@ + + + + + + Modified: zeppelin/site/contribution/webapplication.html URL: http://svn.apache.org/viewvc/zeppelin/site/contribution/webapplication.html?rev=1762596=1762595=1762596=diff == --- zeppelin/site/contribution/webapplication.html (original) +++ zeppelin/site/contribution/webapplication.html Wed Sep 28 01:44:12 2016 @@ -124,6 +124,12 @@ + + + + + + @@ -290,6 +296,16 @@ + + + + + + +4 - Using ng-bind + + + Modified: zeppelin/site/contribution/zeppelinweb/goodPracticeGuide01.html URL: http://svn.apache.org/viewvc/zeppelin/site/contribution/zeppelinweb/goodPracticeGuide01.html?rev=1762596=1762595=1762596=diff == --- zeppelin/site/contribution/zeppelinweb/goodPracticeGuide01.html (original) +++ zeppelin/site/contribution/zeppelinweb/goodPracticeGuide01.html Wed Sep 28 01:44:12 2016 @@ -124,6 +124,12 @@ + + + + + + @@ -294,6 +300,16 @@ + + +4 - Using ng-bind + + + + + + + @@ -374,8 +390,8 @@ limitations under the License. We should have only one Angular Component per file, and it should look like this: -(function() { - use strict; +use strict; +(function() { angular.module(zeppelinWebApp).controller(HomeCtrl, HomeCtrl); Modified: zeppelin/site/contribution/zeppelinweb/goodPracticeGuide02.html URL: http://svn.apache.org/viewvc/zeppelin/site/contribution/zeppelinweb/goodPracticeGuide02.html?rev=1762596=1762595=1762596=diff == --- zeppelin/site/contribution/zeppelinweb/goodPracticeGuide02.html (original) +++ zeppelin/site/contribution/zeppelinweb/goodPracticeGuide02.html Wed Sep 28 01:44:12 2016 @@ -124,6 +124,12 @@ + + + + + + @@ -290,6 +296,16 @@ + + + + + + +4 - Using ng-bind + + + Modified: zeppelin/site/contribution/zeppelinweb/goodPracticeGuide03.html URL: http://svn.apache.org/viewvc/zeppelin/site/contribution/zeppelinweb/goodPracticeGuide03.html?rev=1762596=1762595=1762596=diff == --- zeppelin/site/contribution/zeppelinweb/goodPracticeGuide03.html (original) +++ zeppelin/site/contribution/zeppelinweb/goodPracticeGuide03.html Wed Sep 28 01:44:12 2016 @@ -124,6 +124,12 @@ + + + + + + @@ -294,6 +300,16 @@ + + +4 - Using ng-bind + + + + + + + @@ -447,7 +463,7 @@ Our main rule regarding writing a contro Now lets see how we can use it inside our .html view
zeppelin git commit: Closes #61
Repository: zeppelin Updated Branches: refs/heads/master 403c8c4e7 -> dcc1655e3 Closes #61 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/dcc1655e Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/dcc1655e Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/dcc1655e Branch: refs/heads/master Commit: dcc1655e31db36704c46c00bf63720d02d1ecea3 Parents: 403c8c4 Author: Damien CORNEAUAuthored: Tue Sep 27 15:54:17 2016 +0900 Committer: Damien CORNEAU Committed: Tue Sep 27 15:54:17 2016 +0900 -- --
svn commit: r1762400 [4/14] - in /zeppelin/site/docs/0.7.0-SNAPSHOT: ./ development/ displaysystem/ install/ interpreter/ manual/ quickstart/ rest-api/ security/ storage/
Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/install/yarn_install.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/install/yarn_install.html?rev=1762400=1762399=1762400=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/install/yarn_install.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/install/yarn_install.html Tue Sep 27 03:49:16 2016 @@ -18,9 +18,9 @@ - - - + + + https://code.jquery.com/jquery-1.10.2.min.js"> - - - - - - + + + + + + - - + + @@ -54,7 +54,7 @@ - + Zeppelin 0.7.0-SNAPSHOT @@ -65,108 +65,108 @@ Quick Start -What is Apache Zeppelin ? +What is Apache Zeppelin ? Getting Started -Install -Configuration -Explore Zeppelin UI -Tutorial +Install +Configuration +Explore Zeppelin UI +Tutorial Basic Feature Guide -Dynamic Form -Publish your Paragraph -Customize Zeppelin Homepage +Dynamic Form +Publish your Paragraph +Customize Zeppelin Homepage More -Upgrade Zeppelin Version +Upgrade Zeppelin Version Interpreter -Overview +Overview Usage -Interpreter Installation - -Interpreter Dependency Management +Interpreter Installation + +Interpreter Dependency Management Available Interpreters -Alluxio -Beam -BigQuery -Cassandra -Elasticsearch -Flink -Geode -HBase -HDFS -Hive -Ignite -JDBC -Lens -Livy -Markdown -Python -Postgresql, HAWQ -R -Scalding -Shell -Spark +Alluxio +Beam +BigQuery +Cassandra +Elasticsearch +Flink +Geode +HBase +HDFS +Hive +Ignite +JDBC +Lens +Livy +Markdown +Python +Postgresql, HAWQ +R +Scalding +Shell +Spark Display System Basic Display System -Text -Html -Table +Text +Html +Table Angular API -Angular (backend API) -Angular (frontend API) +Angular (backend API) +Angular (frontend API) More Notebook Storage -Git Storage -S3 Storage -Azure Storage -ZeppelinHub Storage +Git Storage +S3 Storage +Azure Storage +ZeppelinHub Storage REST API -Interpreter API -Notebook API -Configuration API -Credential API +Interpreter API +Notebook API +Configuration API +Credential API Security -Authentication for NGINX -Shiro Authentication -Notebook Authorization -Data Source Authorization +Authentication for NGINX +Shiro Authentication +Notebook Authorization +Data Source Authorization Advanced -Zeppelin on Vagrant VM -Zeppelin on Spark Cluster Mode (Standalone) -Zeppelin on Spark Cluster Mode (YARN) -Zeppelin on Spark Cluster Mode
svn commit: r1762400 [11/14] - in /zeppelin/site/docs/0.7.0-SNAPSHOT: ./ development/ displaysystem/ install/ interpreter/ manual/ quickstart/ rest-api/ security/ storage/
Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/manual/publish.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/manual/publish.html?rev=1762400=1762399=1762400=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/manual/publish.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/manual/publish.html Tue Sep 27 03:49:16 2016 @@ -18,9 +18,9 @@ - - - + + + https://code.jquery.com/jquery-1.10.2.min.js"> - - - - - - + + + + + + - - + + @@ -54,7 +54,7 @@ - + Zeppelin 0.7.0-SNAPSHOT @@ -65,108 +65,108 @@ Quick Start -What is Apache Zeppelin ? +What is Apache Zeppelin ? Getting Started -Install -Configuration -Explore Zeppelin UI -Tutorial +Install +Configuration +Explore Zeppelin UI +Tutorial Basic Feature Guide -Dynamic Form -Publish your Paragraph -Customize Zeppelin Homepage +Dynamic Form +Publish your Paragraph +Customize Zeppelin Homepage More -Upgrade Zeppelin Version +Upgrade Zeppelin Version Interpreter -Overview +Overview Usage -Interpreter Installation - -Interpreter Dependency Management +Interpreter Installation + +Interpreter Dependency Management Available Interpreters -Alluxio -Beam -BigQuery -Cassandra -Elasticsearch -Flink -Geode -HBase -HDFS -Hive -Ignite -JDBC -Lens -Livy -Markdown -Python -Postgresql, HAWQ -R -Scalding -Shell -Spark +Alluxio +Beam +BigQuery +Cassandra +Elasticsearch +Flink +Geode +HBase +HDFS +Hive +Ignite +JDBC +Lens +Livy +Markdown +Python +Postgresql, HAWQ +R +Scalding +Shell +Spark Display System Basic Display System -Text -Html -Table +Text +Html +Table Angular API -Angular (backend API) -Angular (frontend API) +Angular (backend API) +Angular (frontend API) More Notebook Storage -Git Storage -S3 Storage -Azure Storage -ZeppelinHub Storage +Git Storage +S3 Storage +Azure Storage +ZeppelinHub Storage REST API -Interpreter API -Notebook API -Configuration API -Credential API +Interpreter API +Notebook API +Configuration API +Credential API Security -Authentication for NGINX -Shiro Authentication -Notebook Authorization -Data Source Authorization +Authentication for NGINX +Shiro Authentication +Notebook Authorization +Data Source Authorization Advanced -Zeppelin on Vagrant VM -Zeppelin on Spark Cluster Mode (Standalone) -Zeppelin on Spark Cluster Mode (YARN) -Zeppelin on Spark Cluster Mode (Mesos) +
svn commit: r1762400 [13/14] - in /zeppelin/site/docs/0.7.0-SNAPSHOT: ./ development/ displaysystem/ install/ interpreter/ manual/ quickstart/ rest-api/ security/ storage/
Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/screenshots.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/screenshots.html?rev=1762400=1762399=1762400=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/screenshots.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/screenshots.html Tue Sep 27 03:49:16 2016 @@ -18,9 +18,9 @@ - - - + + + https://code.jquery.com/jquery-1.10.2.min.js"> - - - - - - + + + + + + - - + + @@ -54,7 +54,7 @@ - + Zeppelin 0.7.0-SNAPSHOT @@ -65,108 +65,108 @@ Quick Start -What is Apache Zeppelin ? +What is Apache Zeppelin ? Getting Started -Install -Configuration -Explore Zeppelin UI -Tutorial +Install +Configuration +Explore Zeppelin UI +Tutorial Basic Feature Guide -Dynamic Form -Publish your Paragraph -Customize Zeppelin Homepage +Dynamic Form +Publish your Paragraph +Customize Zeppelin Homepage More -Upgrade Zeppelin Version +Upgrade Zeppelin Version Interpreter -Overview +Overview Usage -Interpreter Installation - -Interpreter Dependency Management +Interpreter Installation + +Interpreter Dependency Management Available Interpreters -Alluxio -Beam -BigQuery -Cassandra -Elasticsearch -Flink -Geode -HBase -HDFS -Hive -Ignite -JDBC -Lens -Livy -Markdown -Python -Postgresql, HAWQ -R -Scalding -Shell -Spark +Alluxio +Beam +BigQuery +Cassandra +Elasticsearch +Flink +Geode +HBase +HDFS +Hive +Ignite +JDBC +Lens +Livy +Markdown +Python +Postgresql, HAWQ +R +Scalding +Shell +Spark Display System Basic Display System -Text -Html -Table +Text +Html +Table Angular API -Angular (backend API) -Angular (frontend API) +Angular (backend API) +Angular (frontend API) More Notebook Storage -Git Storage -S3 Storage -Azure Storage -ZeppelinHub Storage +Git Storage +S3 Storage +Azure Storage +ZeppelinHub Storage REST API -Interpreter API -Notebook API -Configuration API -Credential API +Interpreter API +Notebook API +Configuration API +Credential API Security -Authentication for NGINX -Shiro Authentication -Notebook Authorization -Data Source Authorization +Authentication for NGINX +Shiro Authentication +Notebook Authorization +Data Source Authorization Advanced -Zeppelin on Vagrant VM -Zeppelin on Spark Cluster Mode (Standalone) -Zeppelin on Spark Cluster Mode (YARN) -Zeppelin on Spark Cluster Mode (Mesos) +Zeppelin on
svn commit: r1762400 [3/14] - in /zeppelin/site/docs/0.7.0-SNAPSHOT: ./ development/ displaysystem/ install/ interpreter/ manual/ quickstart/ rest-api/ security/ storage/
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=1762400=1762399=1762400=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/install/install.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/install/install.html Tue Sep 27 03:49:16 2016 @@ -18,9 +18,9 @@ - - - + + + https://code.jquery.com/jquery-1.10.2.min.js"> - - - - - - + + + + + + - - + + @@ -54,7 +54,7 @@ - + Zeppelin 0.7.0-SNAPSHOT @@ -65,108 +65,108 @@ Quick Start -What is Apache Zeppelin ? +What is Apache Zeppelin ? Getting Started -Install -Configuration -Explore Zeppelin UI -Tutorial +Install +Configuration +Explore Zeppelin UI +Tutorial Basic Feature Guide -Dynamic Form -Publish your Paragraph -Customize Zeppelin Homepage +Dynamic Form +Publish your Paragraph +Customize Zeppelin Homepage More -Upgrade Zeppelin Version +Upgrade Zeppelin Version Interpreter -Overview +Overview Usage -Interpreter Installation - -Interpreter Dependency Management +Interpreter Installation + +Interpreter Dependency Management Available Interpreters -Alluxio -Beam -BigQuery -Cassandra -Elasticsearch -Flink -Geode -HBase -HDFS -Hive -Ignite -JDBC -Lens -Livy -Markdown -Python -Postgresql, HAWQ -R -Scalding -Shell -Spark +Alluxio +Beam +BigQuery +Cassandra +Elasticsearch +Flink +Geode +HBase +HDFS +Hive +Ignite +JDBC +Lens +Livy +Markdown +Python +Postgresql, HAWQ +R +Scalding +Shell +Spark Display System Basic Display System -Text -Html -Table +Text +Html +Table Angular API -Angular (backend API) -Angular (frontend API) +Angular (backend API) +Angular (frontend API) More Notebook Storage -Git Storage -S3 Storage -Azure Storage -ZeppelinHub Storage +Git Storage +S3 Storage +Azure Storage +ZeppelinHub Storage REST API -Interpreter API -Notebook API -Configuration API -Credential API +Interpreter API +Notebook API +Configuration API +Credential API Security -Authentication for NGINX -Shiro Authentication -Notebook Authorization -Data Source Authorization +Authentication for NGINX +Shiro Authentication +Notebook Authorization +Data Source Authorization Advanced -Zeppelin on Vagrant VM -Zeppelin on Spark Cluster Mode (Standalone) -Zeppelin on Spark Cluster Mode (YARN) -Zeppelin on Spark Cluster Mode (Mesos) +
svn commit: r1762400 [5/14] - in /zeppelin/site/docs/0.7.0-SNAPSHOT: ./ development/ displaysystem/ install/ interpreter/ manual/ quickstart/ rest-api/ security/ storage/
Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/cassandra.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/cassandra.html?rev=1762400=1762399=1762400=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/cassandra.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/cassandra.html Tue Sep 27 03:49:16 2016 @@ -18,9 +18,9 @@ - - - + + + https://code.jquery.com/jquery-1.10.2.min.js"> - - - - - - + + + + + + - - + + @@ -54,7 +54,7 @@ - + Zeppelin 0.7.0-SNAPSHOT @@ -65,108 +65,108 @@ Quick Start -What is Apache Zeppelin ? +What is Apache Zeppelin ? Getting Started -Install -Configuration -Explore Zeppelin UI -Tutorial +Install +Configuration +Explore Zeppelin UI +Tutorial Basic Feature Guide -Dynamic Form -Publish your Paragraph -Customize Zeppelin Homepage +Dynamic Form +Publish your Paragraph +Customize Zeppelin Homepage More -Upgrade Zeppelin Version +Upgrade Zeppelin Version Interpreter -Overview +Overview Usage -Interpreter Installation - -Interpreter Dependency Management +Interpreter Installation + +Interpreter Dependency Management Available Interpreters -Alluxio -Beam -BigQuery -Cassandra -Elasticsearch -Flink -Geode -HBase -HDFS -Hive -Ignite -JDBC -Lens -Livy -Markdown -Python -Postgresql, HAWQ -R -Scalding -Shell -Spark +Alluxio +Beam +BigQuery +Cassandra +Elasticsearch +Flink +Geode +HBase +HDFS +Hive +Ignite +JDBC +Lens +Livy +Markdown +Python +Postgresql, HAWQ +R +Scalding +Shell +Spark Display System Basic Display System -Text -Html -Table +Text +Html +Table Angular API -Angular (backend API) -Angular (frontend API) +Angular (backend API) +Angular (frontend API) More Notebook Storage -Git Storage -S3 Storage -Azure Storage -ZeppelinHub Storage +Git Storage +S3 Storage +Azure Storage +ZeppelinHub Storage REST API -Interpreter API -Notebook API -Configuration API -Credential API +Interpreter API +Notebook API +Configuration API +Credential API Security -Authentication for NGINX -Shiro Authentication -Notebook Authorization -Data Source Authorization +Authentication for NGINX +Shiro Authentication +Notebook Authorization +Data Source Authorization Advanced -Zeppelin on Vagrant VM -Zeppelin on Spark Cluster Mode (Standalone) -Zeppelin on Spark Cluster Mode (YARN) -Zeppelin on Spark Cluster
svn commit: r1762400 [7/14] - in /zeppelin/site/docs/0.7.0-SNAPSHOT: ./ development/ displaysystem/ install/ interpreter/ manual/ quickstart/ rest-api/ security/ storage/
Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/jdbc.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/jdbc.html?rev=1762400=1762399=1762400=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/jdbc.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/jdbc.html Tue Sep 27 03:49:16 2016 @@ -18,9 +18,9 @@ - - - + + + https://code.jquery.com/jquery-1.10.2.min.js"> - - - - - - + + + + + + - - + + @@ -54,7 +54,7 @@ - + Zeppelin 0.7.0-SNAPSHOT @@ -65,108 +65,108 @@ Quick Start -What is Apache Zeppelin ? +What is Apache Zeppelin ? Getting Started -Install -Configuration -Explore Zeppelin UI -Tutorial +Install +Configuration +Explore Zeppelin UI +Tutorial Basic Feature Guide -Dynamic Form -Publish your Paragraph -Customize Zeppelin Homepage +Dynamic Form +Publish your Paragraph +Customize Zeppelin Homepage More -Upgrade Zeppelin Version +Upgrade Zeppelin Version Interpreter -Overview +Overview Usage -Interpreter Installation - -Interpreter Dependency Management +Interpreter Installation + +Interpreter Dependency Management Available Interpreters -Alluxio -Beam -BigQuery -Cassandra -Elasticsearch -Flink -Geode -HBase -HDFS -Hive -Ignite -JDBC -Lens -Livy -Markdown -Python -Postgresql, HAWQ -R -Scalding -Shell -Spark +Alluxio +Beam +BigQuery +Cassandra +Elasticsearch +Flink +Geode +HBase +HDFS +Hive +Ignite +JDBC +Lens +Livy +Markdown +Python +Postgresql, HAWQ +R +Scalding +Shell +Spark Display System Basic Display System -Text -Html -Table +Text +Html +Table Angular API -Angular (backend API) -Angular (frontend API) +Angular (backend API) +Angular (frontend API) More Notebook Storage -Git Storage -S3 Storage -Azure Storage -ZeppelinHub Storage +Git Storage +S3 Storage +Azure Storage +ZeppelinHub Storage REST API -Interpreter API -Notebook API -Configuration API -Credential API +Interpreter API +Notebook API +Configuration API +Credential API Security -Authentication for NGINX -Shiro Authentication -Notebook Authorization -Data Source Authorization +Authentication for NGINX +Shiro Authentication +Notebook Authorization +Data Source Authorization Advanced -Zeppelin on Vagrant VM -Zeppelin on Spark Cluster Mode (Standalone) -Zeppelin on Spark Cluster Mode (YARN) -Zeppelin on Spark Cluster Mode (Mesos) +
svn commit: r1762400 [12/14] - in /zeppelin/site/docs/0.7.0-SNAPSHOT: ./ development/ displaysystem/ install/ interpreter/ manual/ quickstart/ rest-api/ security/ storage/
Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/rest-api/rest-configuration.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/rest-api/rest-configuration.html?rev=1762400=1762399=1762400=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/rest-api/rest-configuration.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/rest-api/rest-configuration.html Tue Sep 27 03:49:16 2016 @@ -18,9 +18,9 @@ - - - + + + https://code.jquery.com/jquery-1.10.2.min.js"> - - - - - - + + + + + + - - + + @@ -54,7 +54,7 @@ - + Zeppelin 0.7.0-SNAPSHOT @@ -65,108 +65,108 @@ Quick Start -What is Apache Zeppelin ? +What is Apache Zeppelin ? Getting Started -Install -Configuration -Explore Zeppelin UI -Tutorial +Install +Configuration +Explore Zeppelin UI +Tutorial Basic Feature Guide -Dynamic Form -Publish your Paragraph -Customize Zeppelin Homepage +Dynamic Form +Publish your Paragraph +Customize Zeppelin Homepage More -Upgrade Zeppelin Version +Upgrade Zeppelin Version Interpreter -Overview +Overview Usage -Interpreter Installation - -Interpreter Dependency Management +Interpreter Installation + +Interpreter Dependency Management Available Interpreters -Alluxio -Beam -BigQuery -Cassandra -Elasticsearch -Flink -Geode -HBase -HDFS -Hive -Ignite -JDBC -Lens -Livy -Markdown -Python -Postgresql, HAWQ -R -Scalding -Shell -Spark +Alluxio +Beam +BigQuery +Cassandra +Elasticsearch +Flink +Geode +HBase +HDFS +Hive +Ignite +JDBC +Lens +Livy +Markdown +Python +Postgresql, HAWQ +R +Scalding +Shell +Spark Display System Basic Display System -Text -Html -Table +Text +Html +Table Angular API -Angular (backend API) -Angular (frontend API) +Angular (backend API) +Angular (frontend API) More Notebook Storage -Git Storage -S3 Storage -Azure Storage -ZeppelinHub Storage +Git Storage +S3 Storage +Azure Storage +ZeppelinHub Storage REST API -Interpreter API -Notebook API -Configuration API -Credential API +Interpreter API +Notebook API +Configuration API +Credential API Security -Authentication for NGINX -Shiro Authentication -Notebook Authorization -Data Source Authorization +Authentication for NGINX +Shiro Authentication +Notebook Authorization +Data Source Authorization Advanced -Zeppelin on Vagrant VM -Zeppelin on Spark Cluster Mode (Standalone) -Zeppelin on Spark Cluster Mode (YARN) -
svn commit: r1762400 [9/14] - in /zeppelin/site/docs/0.7.0-SNAPSHOT: ./ development/ displaysystem/ install/ interpreter/ manual/ quickstart/ rest-api/ security/ storage/
Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/shell.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/shell.html?rev=1762400=1762399=1762400=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/shell.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/shell.html Tue Sep 27 03:49:16 2016 @@ -18,9 +18,9 @@ - - - + + + https://code.jquery.com/jquery-1.10.2.min.js"> - - - - - - + + + + + + - - + + @@ -54,7 +54,7 @@ - + Zeppelin 0.7.0-SNAPSHOT @@ -65,108 +65,108 @@ Quick Start -What is Apache Zeppelin ? +What is Apache Zeppelin ? Getting Started -Install -Configuration -Explore Zeppelin UI -Tutorial +Install +Configuration +Explore Zeppelin UI +Tutorial Basic Feature Guide -Dynamic Form -Publish your Paragraph -Customize Zeppelin Homepage +Dynamic Form +Publish your Paragraph +Customize Zeppelin Homepage More -Upgrade Zeppelin Version +Upgrade Zeppelin Version Interpreter -Overview +Overview Usage -Interpreter Installation - -Interpreter Dependency Management +Interpreter Installation + +Interpreter Dependency Management Available Interpreters -Alluxio -Beam -BigQuery -Cassandra -Elasticsearch -Flink -Geode -HBase -HDFS -Hive -Ignite -JDBC -Lens -Livy -Markdown -Python -Postgresql, HAWQ -R -Scalding -Shell -Spark +Alluxio +Beam +BigQuery +Cassandra +Elasticsearch +Flink +Geode +HBase +HDFS +Hive +Ignite +JDBC +Lens +Livy +Markdown +Python +Postgresql, HAWQ +R +Scalding +Shell +Spark Display System Basic Display System -Text -Html -Table +Text +Html +Table Angular API -Angular (backend API) -Angular (frontend API) +Angular (backend API) +Angular (frontend API) More Notebook Storage -Git Storage -S3 Storage -Azure Storage -ZeppelinHub Storage +Git Storage +S3 Storage +Azure Storage +ZeppelinHub Storage REST API -Interpreter API -Notebook API -Configuration API -Credential API +Interpreter API +Notebook API +Configuration API +Credential API Security -Authentication for NGINX -Shiro Authentication -Notebook Authorization -Data Source Authorization +Authentication for NGINX +Shiro Authentication +Notebook Authorization +Data Source Authorization Advanced -Zeppelin on Vagrant VM -Zeppelin on Spark Cluster Mode (Standalone) -Zeppelin on Spark Cluster Mode (YARN) -Zeppelin on Spark Cluster Mode (Mesos) +
zeppelin git commit: [ZEPPELIN-1446] Fix broken layout of `Create new interpreter` UI.
Repository: zeppelin Updated Branches: refs/heads/master a3ca80031 -> 2cb39f92e [ZEPPELIN-1446] Fix broken layout of `Create new interpreter` UI. ### What is this PR for? This PR fixes broken layout of `Create new interpreter` UI. ### What type of PR is it? Bug Fix ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1446 ### How should this be tested? - Try to create new interpreter on the Interpreters menu. ### Screenshots (if appropriate) - before ![image](https://cloud.githubusercontent.com/assets/3348133/18592384/b3bfe120-7c71-11e6-80c2-31d0b4363009.png) - after ![image](https://cloud.githubusercontent.com/assets/3348133/18592410/c777aef0-7c71-11e6-9379-9b424823fbed.png) ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: astroshimCloses #1431 from astroshim/ZEPPELIN-1446 and squashes the following commits: 729215b [astroshim] Merge branch 'master' into ZEPPELIN-1446 69cc1a0 [astroshim] Merge branch 'master' into ZEPPELIN-1446 fada36b [astroshim] fix spaces 2d3ec76 [astroshim] fix space 5f0a461 [astroshim] fix align checkboxs. Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/2cb39f92 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/2cb39f92 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/2cb39f92 Branch: refs/heads/master Commit: 2cb39f92e5e1b3872e0b2e880b3bceff57769d42 Parents: a3ca800 Author: astroshim Authored: Thu Sep 22 14:41:03 2016 +0900 Committer: Damien CORNEAU Committed: Fri Sep 23 18:44:42 2016 +0900 -- .../interpreter-create/interpreter-create.html | 230 ++- 1 file changed, 122 insertions(+), 108 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/2cb39f92/zeppelin-web/src/app/interpreter/interpreter-create/interpreter-create.html -- diff --git a/zeppelin-web/src/app/interpreter/interpreter-create/interpreter-create.html b/zeppelin-web/src/app/interpreter/interpreter-create/interpreter-create.html index 1550126..d0e0749 100644 --- a/zeppelin-web/src/app/interpreter/interpreter-create/interpreter-create.html +++ b/zeppelin-web/src/app/interpreter/interpreter-create/interpreter-create.html @@ -35,8 +35,8 @@ limitations under the License. -Option + Option @@ -68,130 +68,144 @@ limitations under the License. Interpreter for note - - - - - Connect to existing process - + + + + + + + Connect to existing process + + + - - Host + + +Host - - - Port - + pu-elastic-input-minwidth="180px" ng-model="newInterpreterSetting.option.host"/> + + +Port + + - - - + + + - -Set permission + + + Set permission + + + - - - - - -Enter comma separated users in the fields. -Empty field (*) implies anyone can run this interpreter. - + + + + - -Owners - - {{user}} - + + Enter comma separated users in the fields. + Empty field (*) implies anyone can run this interpreter. + + + Owners + +{{user}} + + + + Properties + + + name + value + description + action + + + {{key}} + + {{value.description}} + + + + + + + + + + + + + + + + + + + -Properties - -
svn commit: r1761865 - in /zeppelin/site/contribution: contributions.html documentation.html webapplication.html zeppelinweb/goodPracticeGuide01.html zeppelinweb/goodPracticeGuide02.html zeppelinweb/g
Author: corneadoug Date: Thu Sep 22 08:15:13 2016 New Revision: 1761865 URL: http://svn.apache.org/viewvc?rev=1761865=rev Log: Add zeppelinweb good practice 3 Added: zeppelin/site/contribution/zeppelinweb/goodPracticeGuide03.html Modified: zeppelin/site/contribution/contributions.html zeppelin/site/contribution/documentation.html zeppelin/site/contribution/webapplication.html zeppelin/site/contribution/zeppelinweb/goodPracticeGuide01.html zeppelin/site/contribution/zeppelinweb/goodPracticeGuide02.html Modified: zeppelin/site/contribution/contributions.html URL: http://svn.apache.org/viewvc/zeppelin/site/contribution/contributions.html?rev=1761865=1761864=1761865=diff == --- zeppelin/site/contribution/contributions.html (original) +++ zeppelin/site/contribution/contributions.html Thu Sep 22 08:15:13 2016 @@ -118,12 +118,12 @@ + + - - @@ -284,12 +284,12 @@ + + - - Modified: zeppelin/site/contribution/documentation.html URL: http://svn.apache.org/viewvc/zeppelin/site/contribution/documentation.html?rev=1761865=1761864=1761865=diff == --- zeppelin/site/contribution/documentation.html (original) +++ zeppelin/site/contribution/documentation.html Thu Sep 22 08:15:13 2016 @@ -118,12 +118,12 @@ + + - - @@ -284,12 +284,12 @@ + + - - Modified: zeppelin/site/contribution/webapplication.html URL: http://svn.apache.org/viewvc/zeppelin/site/contribution/webapplication.html?rev=1761865=1761864=1761865=diff == --- zeppelin/site/contribution/webapplication.html (original) +++ zeppelin/site/contribution/webapplication.html Thu Sep 22 08:15:13 2016 @@ -118,12 +118,12 @@ + + - - @@ -284,12 +284,16 @@ + + +3 - Making A Controller + + + - - Modified: zeppelin/site/contribution/zeppelinweb/goodPracticeGuide01.html URL: http://svn.apache.org/viewvc/zeppelin/site/contribution/zeppelinweb/goodPracticeGuide01.html?rev=1761865=1761864=1761865=diff == --- zeppelin/site/contribution/zeppelinweb/goodPracticeGuide01.html (original) +++ zeppelin/site/contribution/zeppelinweb/goodPracticeGuide01.html Thu Sep 22 08:15:13 2016 @@ -118,12 +118,12 @@ + + - - @@ -284,12 +284,16 @@ + + +3 - Making A Controller + + + - - Modified: zeppelin/site/contribution/zeppelinweb/goodPracticeGuide02.html URL: http://svn.apache.org/viewvc/zeppelin/site/contribution/zeppelinweb/goodPracticeGuide02.html?rev=1761865=1761864=1761865=diff == --- zeppelin/site/contribution/zeppelinweb/goodPracticeGuide02.html (original) +++ zeppelin/site/contribution/zeppelinweb/goodPracticeGuide02.html Thu Sep 22 08:15:13 2016 @@ -118,12 +118,12 @@ + + - - @@ -284,12 +284,16 @@ + + +3 - Making A Controller + + + - - @@ -402,6 +406,7 @@ $rootScope.$on(eventToCatch, f Usage of event dispatching should be limited if possible We only use $rootScope.$broadcast and $scope.$on for event dispatching/catching +We are grouping all the $scope.$on functions at the end of the compponent using it (controller or service) Performances Added: zeppelin/site/contribution/zeppelinweb/goodPracticeGuide03.html URL: http://svn.apache.org/viewvc/zeppelin/site/contribution/zeppelinweb/goodPracticeGuide03.html?rev=1761865=auto == --- zeppelin/site/contribution/zeppelinweb/goodPracticeGuide03.html (added) +++ zeppelin/site/contribution/zeppelinweb/goodPracticeGuide03.html Thu Sep 22 08:15:13 2016 @@ -0,0 +1,517 @@ + + + + + + +3 - Making A Controller + + + + + + + + + + + + + + + + + +https://code.jquery.com/jquery-1.10.2.min.js&
zeppelin git commit: [ZEPPELIN-1462] Zeppelin-Web Good Practices #3
Repository: zeppelin Updated Branches: refs/heads/gh-pages 4280cba17 -> fd772df06 [ZEPPELIN-1462] Zeppelin-Web Good Practices #3 ### What is this PR for? This Good Practice Guide will focus on how to write a controller following the controller as vm concept, and how to provide a nice separation of the code. ### What type of PR is it? Documentation ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1462 ### How should this be tested? Check the `.md` file, or build the website to see the full rendering ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Damien CORNEAU <cornead...@gmail.com> Closes #1443 from corneadoug/ZEPPELIN-1462 and squashes the following commits: 2dc04e0 [Damien CORNEAU] Address feedbacks a4a2645 [Damien CORNEAU] Add the new Practive Guide Page Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/fd772df0 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/fd772df0 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/fd772df0 Branch: refs/heads/gh-pages Commit: fd772df06ee2cd722349673185b4bc12a53c6d32 Parents: 4280cba Author: Damien CORNEAU <cornead...@gmail.com> Authored: Thu Sep 22 10:06:12 2016 +0900 Committer: Damien CORNEAU <cornead...@gmail.com> Committed: Thu Sep 22 17:09:30 2016 +0900 -- contribution/zeppelinweb/goodPracticeGuide02.md | 1 + contribution/zeppelinweb/goodPracticeGuide03.md | 143 +++ 2 files changed, 144 insertions(+) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/fd772df0/contribution/zeppelinweb/goodPracticeGuide02.md -- diff --git a/contribution/zeppelinweb/goodPracticeGuide02.md b/contribution/zeppelinweb/goodPracticeGuide02.md index b3d39f2..bf9a55f 100644 --- a/contribution/zeppelinweb/goodPracticeGuide02.md +++ b/contribution/zeppelinweb/goodPracticeGuide02.md @@ -56,6 +56,7 @@ Now, there are a few things to know about using it from `$rootScope`: * Usage of event dispatching should be limited if possible * We only use `$rootScope.$broadcast` and `$scope.$on` for event dispatching/catching +* We are grouping all the `$scope.$on` functions at the end of the compponent using it (controller or service) Performances http://git-wip-us.apache.org/repos/asf/zeppelin/blob/fd772df0/contribution/zeppelinweb/goodPracticeGuide03.md -- diff --git a/contribution/zeppelinweb/goodPracticeGuide03.md b/contribution/zeppelinweb/goodPracticeGuide03.md new file mode 100644 index 000..836271f --- /dev/null +++ b/contribution/zeppelinweb/goodPracticeGuide03.md @@ -0,0 +1,143 @@ +--- +layout: sideMenu +title: "3 - Making A Controller" +description: "" +group: nav-contrib-front +menu: nav-contrib-front +--- + + +# How to Write a Controller + + +Our main rule regarding writing a controller, is to use the `Controller as vm` style, however, we also have a few other style guidelines. + +You can see below a full example of what the controller would look like. + +``` +(function() { + 'use strict'; + + angular.module('zeppelinWebApp') +.controller('myNewController', myNewController); + +myNewController.$inject = ['$http']; + +function myNewController($http) { + + var vm = this; + + vm.publicVariable = {}; + + // Controller's public functions + vm.myControllerPublicFunction = myControllerPublicFunction; + + _init(); + + /* + ** Public functions Implementation ** + */ + + function myControllerPublicFunction() { + +... + + } + + function myOtherPublicFunction() { + +_utilFunction(); +... + + } + + /* + ** Private functions Implementation ** + */ + + function _init() { + +vm.myControllerPublicFunction(); +... + + } + + function _utilFunction() { + +... + + } + + /*** + ** $scope.$on catchers Implementation ** + ***/ + + $scope.$on('eventName', function(event) { + +... + + }) +} +})(); +``` + +This might look like a lot of lines, but it is mainly to show all the rules at once. + + + Using the controller in a view + +Now let's see how we can use it inside our `.html` view in normal situations. + +``` + + {{ newCtrl.publicVariable }} + +``` + + Using the controller in a page + +In the case whe
zeppelin git commit: [MINOR] Hide "Currently there are no properties ~" msg & "edit", "restart" and "remove" btn in edit mode
Repository: zeppelin Updated Branches: refs/heads/master 46cd56ad2 -> f2a5c594d [MINOR] Hide "Currently there are no properties ~" msg & "edit", "restart" and "remove" btn in edit mode ### What is this PR for? "Currently there are no properties and dependencies set for this interpreter" message is shown when there are no properties & dependencies in interpreter setting page. But this message can be seen even in the edit mode. It's quite wired. This message needs to be shown only in non-editable mode. The `edit`, `restart` and `remove` button are same. - `edit` button doesn't do any work after changing to edit mode - `restart` button: it doesn't make sense that someone is editing and restarting interpreter at the same time - `remove` button: Maybe someone wants to remove the interpreter while he is editing the interpreter. But it would be better this button is shown only in non-editable mode for the consistency with the other buttons. For the above reasons, I changed those buttons to be shown in non-editable mode only. `Save` & `Cancel` buttons are enough to the edit page I think. Please see the attached gif image. ### What type of PR is it? Bug Fix ### What is the Jira issue? ### How should this be tested? 1. After applying this patch and build only `zeppelin-web` with `./grunt build` under `zeppelin-web`. 2. You can quickly check this change in dev mode with `./grunt serve`. 3. Go to `Interpreter` menu and click "edit" button on Angular interpreter to see "Currently there are no properties and dependencies set for this interpreter" message. Can also check the existence of `edit`, `restart` and `remove` buttons. ### Screenshots (if appropriate) - Before ![before](https://cloud.githubusercontent.com/assets/10060731/18616987/79b40d3a-7e01-11e6-85a1-e3888ef7f2f5.gif) - After ![after](https://cloud.githubusercontent.com/assets/10060731/18616988/7df1d094-7e01-11e6-9146-400e36b2392a.gif) ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: AhyoungRyuAuthor: AhyoungRyu Closes #1434 from AhyoungRyu/fix/editMode and squashes the following commits: 4433f86 [AhyoungRyu] Make same width 'properties'&'dependencies' table 2e50f5d [AhyoungRyu] Revert 'form' 0c6c937 [AhyoungRyu] Fix minor issues in interpreter setting edit mode Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/f2a5c594 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/f2a5c594 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/f2a5c594 Branch: refs/heads/master Commit: f2a5c594dc8e0810b22cb66b6db06ccb4f8927f4 Parents: 46cd56a Author: AhyoungRyu Authored: Tue Sep 20 16:41:00 2016 +0900 Committer: Damien CORNEAU Committed: Thu Sep 22 09:55:03 2016 +0900 -- zeppelin-web/src/app/interpreter/interpreter.html | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/f2a5c594/zeppelin-web/src/app/interpreter/interpreter.html -- diff --git a/zeppelin-web/src/app/interpreter/interpreter.html b/zeppelin-web/src/app/interpreter/interpreter.html index d7f3440..fe38c16 100644 --- a/zeppelin-web/src/app/interpreter/interpreter.html +++ b/zeppelin-web/src/app/interpreter/interpreter.html @@ -124,7 +124,7 @@ limitations under the License. - + @@ -134,7 +134,7 @@ limitations under the License. restart - remove + remove @@ -229,12 +229,12 @@ limitations under the License. + - + + Currently there are no properties and dependencies set for this interpreter - - Properties @@ -285,8 +285,8 @@ limitations under the License. artifact - exclude - action + exclude + action
zeppelin git commit: [ZEPPELIN-1387] Support table syntax in markdown interpreter
Repository: zeppelin Updated Branches: refs/heads/master eb01bddd9 -> 46cd56ad2 [ZEPPELIN-1387] Support table syntax in markdown interpreter ### What is this PR for? Support table markdown syntax issued by [ZEPPELIN-1387](https://issues.apache.org/jira/browse/ZEPPELIN-1387?jql=project%20%3D%20ZEPPELIN) ### What type of PR is it? [Bug Fix | Improvement] This PR can be categorized as bug fix and improvement since it not only resolves the above issue but also support other markdown syntaxes. ### Todos * [ ] - Check the license issue of the [pegdown](https://github.com/sirthias/pegdown) library introduced by this PR ### What is the Jira issue? [ZEPPELIN-1387](https://issues.apache.org/jira/browse/ZEPPELIN-1387?jql=project%20%3D%20ZEPPELIN) ### How should this be tested? Write markdown texts and compare them with expected html DOMs. I'v also included some tests for this PR. ### Screenshots (if appropriate) https://cloud.githubusercontent.com/assets/4968473/18061274/1f2be526-6e5d-11e6-9f1a-3528f3958d2c.png;> ### Questions: * Does the licenses files need update? * Does coding style is appropriate? ### Additional Comments We might solve this issue by implementing custom table plugin for markdown4j by referring [the existing work of txtmark](https://github.com/zhenchuan/txtmark/commit/178486805e78e3d572b071ca8b9f8887a066edef). But I think it is not good idea in regard to coverage, maintainability and efficiency since markdown4j is currently not developed actively and it costs to implement all markdown plugins which is not supported by markdown4j. Author: 1ambda <1am...@gmail.com> Closes #1384 from 1ambda/fix-zeppelin-1387 and squashes the following commits: 16cda72 [1ambda] fix: Merge with 3c8158 to resolve CI failure e6d41c8 [1ambda] fix: Resolve merge conflict with 8f344db e08929a [1ambda] fix: Handle more specific exception in catch block 8b1e017 [1ambda] chore: Move github-markdown-css license to bin_licenses 4d1cb3c [1ambda] fix: Typo in docs/interpreter/markdown.md 85a5e3a [1ambda] fix: Use bower to install github-markdown-css 297733f [1ambda] fix: Modify github-markdown-css license 947a92a [1ambda] chore: Add license to newly created java files d228423 [1ambda] docs: Update markdown docs config, examples 2b6516c [1ambda] feat: Support markdown.parser.type attr in md d2d4455 [1ambda] style: Reformat using intellij-java-google-style bf9100d [1ambda] chore: Restore markdown4j dependency 55a2f10 [1ambda] fix: Add MarkdownParser interface to support mulitple parsers c33c715 [1ambda] fix: Remove the ANCHORLINKS option 9cf31d0 [1ambda] fix: Use markdown-body class (default) f741949 [1ambda] fix: Add styles for markdown 603d3db [1ambda] fix: Add missing transitive deps for pegdown 7aecdcb [1ambda] chore: Add pegdown to the binary license list fa14b3e [1ambda] style: Apply google java code style guide 029f550 [1ambda] [ZEPPELIN-1387] Support table in markdown interpreter Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/46cd56ad Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/46cd56ad Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/46cd56ad Branch: refs/heads/master Commit: 46cd56ad26d59e93d3875c78f29fc6ebd27dfc07 Parents: eb01bdd Author: 1ambda <1am...@gmail.com> Authored: Wed Sep 21 10:20:58 2016 +0900 Committer: Damien CORNEAUCommitted: Thu Sep 22 09:52:31 2016 +0900 -- .../markdown-example-markdown4j-parser.png | Bin 0 -> 264309 bytes .../markdown-example-pegdown-parser.png | Bin 0 -> 147514 bytes .../docs-img/markdown-interpreter-setting.png | Bin 32571 -> 67890 bytes docs/interpreter/markdown.md| 32 +- markdown/pom.xml| 10 +- .../org/apache/zeppelin/markdown/Markdown.java | 90 -- .../zeppelin/markdown/Markdown4jParser.java | 47 +++ .../zeppelin/markdown/MarkdownInterpreter.java | 124 .../zeppelin/markdown/MarkdownParser.java | 23 ++ .../apache/zeppelin/markdown/PegdownParser.java | 56 .../src/main/resources/interpreter-setting.json | 11 +- .../zeppelin/markdown/Markdown4jParserTest.java | 51 .../apache/zeppelin/markdown/MarkdownTest.java | 48 --- .../zeppelin/markdown/PegdownParserTest.java| 302 +++ zeppelin-distribution/src/bin_license/LICENSE | 11 +- .../licenses/LICENSE-github-markdown-css-2.4.0 | 21 ++ zeppelin-web/bower.json | 3 +- zeppelin-web/src/index.html | 1 + 18 files changed, 683 insertions(+), 147 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/46cd56ad/docs/assets/themes/zeppelin/img/docs-img/markdown-example-markdown4j-parser.png
zeppelin git commit: ZEPPELIN-1456: Flaky Test: AuthenticationIT
Repository: zeppelin Updated Branches: refs/heads/master 9b8421806 -> 1e8559e65 ZEPPELIN-1456: Flaky Test: AuthenticationIT ### What is this PR for? This started happening after ZEPPELIN-1144, https://github.com/apache/zeppelin/pull/1330. This test (testGroupPermission) is to validate the group related permission on a notebook. ### What type of PR is it? [Bug Fix] ### Todos * [ ] - Fix CI ### What is the Jira issue? * [ZEPPELIN-1456](https://issues.apache.org/jira/browse/ZEPPELIN-1456) ### How should this be tested? CI xxx.10 (selenium) should be green ### Screenshots (if appropriate) ### 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: Prabhjyot SinghCloses #1444 from prabhjyotsingh/ZEPPELIN-1456 and squashes the following commits: 3c81587 [Prabhjyot Singh] ZEPPELIN-1456: fix Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/1e8559e6 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/1e8559e6 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/1e8559e6 Branch: refs/heads/master Commit: 1e8559e6518529a869b22422b8b6bc28aad1c3b9 Parents: 9b84218 Author: Prabhjyot Singh Authored: Tue Sep 20 14:53:08 2016 +0530 Committer: Damien CORNEAU Committed: Wed Sep 21 09:52:50 2016 +0900 -- .../zeppelin/integration/AuthenticationIT.java | 25 1 file changed, 21 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1e8559e6/zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java -- diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java index ea3f363..6001429 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java @@ -36,6 +36,7 @@ import org.slf4j.LoggerFactory; import java.io.File; import java.io.IOException; +import java.net.URI; import java.util.List; @@ -176,8 +177,16 @@ public class AuthenticationIT extends AbstractZeppelinIT { authenticationIT.logoutUser("finance1"); authenticationIT.authenticationUser("hr1", "hr1"); - pollingWait(By.xpath("//*[@id='notebook-names']//a[contains(@href, '" + noteId + "')]"), - MAX_BROWSER_TIMEOUT_SEC).click(); + try { +WebElement element = pollingWait(By.xpath("//*[@id='notebook-names']//a[contains(@href, '" + noteId + "')]"), +MAX_BROWSER_TIMEOUT_SEC); +collector.checkThat("Check is user has permission to view this notebook link", false, +CoreMatchers.equalTo(element.isDisplayed())); + } catch (Exception e) { +//This should have failed, nothing to worry. + } + + driver.get(new URI(driver.getCurrentUrl()).resolve("/#/notebook/" + noteId).toString()); List privilegesModal = driver.findElements( By.xpath("//div[@class='modal-content']//div[@class='bootstrap-dialog-header']" + @@ -190,8 +199,16 @@ public class AuthenticationIT extends AbstractZeppelinIT { authenticationIT.logoutUser("hr1"); authenticationIT.authenticationUser("finance2", "finance2"); - pollingWait(By.xpath("//*[@id='notebook-names']//a[contains(@href, '" + noteId + "')]"), - MAX_BROWSER_TIMEOUT_SEC).click(); + try { +WebElement element = pollingWait(By.xpath("//*[@id='notebook-names']//a[contains(@href, '" + noteId + "')]"), +MAX_BROWSER_TIMEOUT_SEC); +collector.checkThat("Check is user has permission to view this notebook link", false, +CoreMatchers.equalTo(element.isDisplayed())); + } catch (Exception e) { +//This should have failed, nothing to worry. + } + + driver.get(new URI(driver.getCurrentUrl()).resolve("/#/notebook/" + noteId).toString()); privilegesModal = driver.findElements( By.xpath("//div[@class='modal-content']//div[@class='bootstrap-dialog-header']" +
svn commit: r1761390 - in /zeppelin/site/docs/0.7.0-SNAPSHOT: interpreter/elasticsearch.html interpreter/hive.html interpreter/livy.html interpreter/markdown.html interpreter/python.html interpreter/s
Author: corneadoug Date: Mon Sep 19 06:51:41 2016 New Revision: 1761390 URL: http://svn.apache.org/viewvc?rev=1761390=rev Log: Fix dead link in docs Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/elasticsearch.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/hive.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/livy.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/markdown.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/python.html zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/shell.html zeppelin/site/docs/0.7.0-SNAPSHOT/manual/dependencymanagement.html Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/elasticsearch.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/elasticsearch.html?rev=1761390=1761389=1761390=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/elasticsearch.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/elasticsearch.html Mon Sep 19 06:51:41 2016 @@ -437,7 +437,7 @@ delete /index/type/id Apply Zeppelin Dynamic Forms -You can leverage Zeppelin Dynamic Form inside your queries. You can use both the text input and select form parameterization features. +You can leverage Zeppelin Dynamic Form inside your queries. You can use both the text input and select form parameterization features. %elasticsearch size ${limit=10} search /index/type { query: { match_all: { } } } Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/hive.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/hive.html?rev=1761390=1761389=1761390=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/hive.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/hive.html Mon Sep 19 06:51:41 2016 @@ -330,7 +330,7 @@ limitations under the License. Apply Zeppelin Dynamic Forms -You can leverage Zeppelin Dynamic Form inside your queries. You can use both the text input and select form parameterization features. +You can leverage Zeppelin Dynamic Form inside your queries. You can use both the text input and select form parameterization features. %hive SELECT ${group_by}, count(*) as count FROM retail_demo.order_lineitems_pxf Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/livy.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/livy.html?rev=1761390=1761389=1761390=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/livy.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/livy.html Mon Sep 19 06:51:41 2016 @@ -355,7 +355,7 @@ hello(livy) Apply Zeppelin Dynamic Forms -You can leverage Zeppelin Dynamic Form. You can use both the text input and select form parameterization features. +You can leverage Zeppelin Dynamic Form. You can use both the text input and select form parameterization features. %livy.pyspark print ${group_by=product_id,product_id|product_name|customer_id|store_id} Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/markdown.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/markdown.html?rev=1761390=1761389=1761390=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/markdown.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/markdown.html Mon Sep 19 06:51:41 2016 @@ -211,13 +211,13 @@ In Zeppelin notebook, you can use In Zeppelin, Markdown interpreter is enabled by default. - + Example The following example demonstrates the basic usage of Markdown in a Zeppelin notebook. - + Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/python.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/python.html?rev=1761390=1761389=1761390=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/python.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/interpreter/python.html Mon Sep 19 06:51:41 2016 @@ -286,7 +286,7 @@ limitations under the License. Pandas integration -Apache Zeppelin Table Display System provides built-in data visualization capabilities. Python interpreter leverages it to visualize Pandas DataFrames though similar z.show() API, same as with Matplotlib integration. +Apache Zeppelin Table Display System provides built-in data visualization capabilities. Python interpreter leverages it to visualize Pandas DataFrames though similar z.show() API, same as with Matplotlib integration. Example: import pandas as pd @@ -295,7 +295,7 @@ limitations under the License. SQL over Pandas DataFrames -There is a convenience %python.sql
zeppelin git commit: [ZEPPELIN-1421] Fix dead link in docs/README.md
Repository: zeppelin Updated Branches: refs/heads/master c69d21f09 -> 8f344db93 [ZEPPELIN-1421] Fix dead link in docs/README.md ### What is this PR for? There is a dead link in [docs/README.md](https://github.com/apache/zeppelin/blob/master/docs/README.md). It should be `https://zeppelin.apache.org/docs/latest/` not `https://zeppelin.apache.org/docs/latest` ### What type of PR is it? Bug Fix ### What is the Jira issue? [ZEPPELIN-1421](https://issues.apache.org/jira/browse/ZEPPELIN-1421) ### How should this be tested? - Before [https://zeppelin.apache.org/docs/latest](https://zeppelin.apache.org/docs/latest) - After [https://zeppelin.apache.org/docs/latest/](https://zeppelin.apache.org/docs/latest/) ### 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: AhyoungRyuCloses #1420 from AhyoungRyu/ZEPPELIN-1421 and squashes the following commits: 57336f8 [AhyoungRyu] Remove BASE_PATH in some docs pages 311e2ef [AhyoungRyu] Fix dead link in docs/README.md Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/8f344db9 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/8f344db9 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/8f344db9 Branch: refs/heads/master Commit: 8f344db93e6cbc8a6f24b7e19c7ed26533577138 Parents: c69d21f Author: AhyoungRyu Authored: Sat Sep 10 15:40:29 2016 +0900 Committer: Damien CORNEAU Committed: Mon Sep 19 15:50:43 2016 +0900 -- docs/README.md | 2 +- docs/interpreter/elasticsearch.md | 2 +- docs/interpreter/hive.md| 2 +- docs/interpreter/livy.md| 2 +- docs/interpreter/markdown.md| 4 ++-- docs/interpreter/python.md | 4 ++-- docs/interpreter/shell.md | 2 +- docs/manual/dependencymanagement.md | 12 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/8f344db9/docs/README.md -- diff --git a/docs/README.md b/docs/README.md index a0c4e96..4dc810e 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,6 +1,6 @@ # Apache Zeppelin documentation -This README will walk you through building the documentation of Apache Zeppelin. The documentation is included here with Apache Zeppelin source code. The online documentation at [https://zeppelin.apache.org/docs/](https://zeppelin.apache.org/docs/latest) is also generated from the files found in here. +This README will walk you through building the documentation of Apache Zeppelin. The documentation is included here with Apache Zeppelin source code. The online documentation at [https://zeppelin.apache.org/docs/](https://zeppelin.apache.org/docs/latest/) is also generated from the files found in here. ## Build documentation Zeppelin is using [Jekyll](https://jekyllrb.com/) which is a static site generator and [Github Pages](https://pages.github.com/) as a site publisher. For the more details, see [help.github.com/articles/about-github-pages-and-jekyll/](https://help.github.com/articles/about-github-pages-and-jekyll/). http://git-wip-us.apache.org/repos/asf/zeppelin/blob/8f344db9/docs/interpreter/elasticsearch.md -- diff --git a/docs/interpreter/elasticsearch.md b/docs/interpreter/elasticsearch.md index 0e59cae..7f3fb27 100644 --- a/docs/interpreter/elasticsearch.md +++ b/docs/interpreter/elasticsearch.md @@ -243,7 +243,7 @@ delete /index/type/id ``` ### Apply Zeppelin Dynamic Forms -You can leverage [Zeppelin Dynamic Form]({{BASE_PATH}}/manual/dynamicform.html) inside your queries. You can use both the `text input` and `select form` parameterization features. +You can leverage [Zeppelin Dynamic Form](../manual/dynamicform.html) inside your queries. You can use both the `text input` and `select form` parameterization features. ```bash %elasticsearch http://git-wip-us.apache.org/repos/asf/zeppelin/blob/8f344db9/docs/interpreter/hive.md -- diff --git a/docs/interpreter/hive.md b/docs/interpreter/hive.md index feeb7a3..ba6614b 100644 --- a/docs/interpreter/hive.md +++ b/docs/interpreter/hive.md @@ -151,7 +151,7 @@ select * from my_table; You can also run multiple queries up to 10 by default. Changing these settings is not implemented yet. ### Apply Zeppelin Dynamic Forms -You can leverage [Zeppelin Dynamic Form]({{BASE_PATH}}/manual/dynamicform.html) inside your queries. You can use both the `text input` and `select form`
zeppelin git commit: [Zeppelin 1415] - Adding Zeppelin-Web Good Practice Guide #2
Repository: zeppelin Updated Branches: refs/heads/gh-pages e53101f87 -> 70e4ecdad [Zeppelin 1415] - Adding Zeppelin-Web Good Practice Guide #2 ### What is this PR for? In this new Good Practice Guide for Zeppelin-web, we focus on how event dispatching($broadcast, $emit, $on) works, and how to correctly use it in the app ### What type of PR is it? Documentation ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1415 ### How should this be tested? You can check the markdown file for typos or bad sentences :) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Damien CORNEAU <cornead...@gmail.com> Closes #1412 from corneadoug/ZEPPELIN-1415 and squashes the following commits: 42cc497 [Damien CORNEAU] add comma 850b908 [Damien CORNEAU] Fix grammar errors 63313cc [Damien CORNEAU] Change uppercasing a bit d551928 [Damien CORNEAU] Add event dispatching documentation 86bb512 [Damien CORNEAU] change page title for goodPracticeGuide01 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/70e4ecda Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/70e4ecda Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/70e4ecda Branch: refs/heads/gh-pages Commit: 70e4ecdadfb5c41f136425eefe26bc71c05ea187 Parents: e53101f Author: Damien CORNEAU <cornead...@gmail.com> Authored: Fri Sep 9 13:51:39 2016 +0900 Committer: Damien CORNEAU <cornead...@gmail.com> Committed: Tue Sep 13 16:48:15 2016 +0900 -- contribution/zeppelinweb/goodPracticeGuide01.md | 2 +- contribution/zeppelinweb/goodPracticeGuide02.md | 66 2 files changed, 67 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/70e4ecda/contribution/zeppelinweb/goodPracticeGuide01.md -- diff --git a/contribution/zeppelinweb/goodPracticeGuide01.md b/contribution/zeppelinweb/goodPracticeGuide01.md index 7580b77..317bd0f 100644 --- a/contribution/zeppelinweb/goodPracticeGuide01.md +++ b/contribution/zeppelinweb/goodPracticeGuide01.md @@ -1,6 +1,6 @@ --- layout: sideMenu -title: "Defining Components" +title: "1 - Defining Components" description: "" group: nav-contrib-front menu: nav-contrib-front http://git-wip-us.apache.org/repos/asf/zeppelin/blob/70e4ecda/contribution/zeppelinweb/goodPracticeGuide02.md -- diff --git a/contribution/zeppelinweb/goodPracticeGuide02.md b/contribution/zeppelinweb/goodPracticeGuide02.md new file mode 100644 index 000..b3d39f2 --- /dev/null +++ b/contribution/zeppelinweb/goodPracticeGuide02.md @@ -0,0 +1,66 @@ +--- +layout: sideMenu +title: "2 - Event Dispatching" +description: "" +group: nav-contrib-front +menu: nav-contrib-front +--- + + +# Event Dispatching in Angular + + +AngularJS provides an Event dispatching system allowing the communication between controllers or services and controllers. + +`$broadcast` dispatches the event downwards through the child scopes + +`$emit` dispatches the event upwards through the scope hierarchy + +`$on` catches the event passing by that scope + + +You can usually see it being used from `$rootScope` or `$scope` + +``` +$scope.$broadcast('eventName', arg); +$rootScope.$broadcast('eventName', arg); + +$scope.$emit('eventName', arg); +$rootScope.$emit('eventName', arg); + +$scope.$on('eventToCatch', function); +$rootScope.$on('eventToCatch', function); +``` + +Now, there are a few things to know about using it from `$rootScope`: + +* Both `$rootScope.$emit` and `$rootScope.$broadcast` go through child scopes since `$rootScope` doesn't have a parent +* `$rootScope.$emit` can only be received by `$rootScope.$on` +* `$rootScope.$broadcast` can be received by `$rootScope.$on` and `$scope.$on` +* `$rootScope.$on` listener needs to be removed by hand (Memory leak if forgotten) + + + How we are using it in the project + +* Usage of event dispatching should be limited if possible +* We only use `$rootScope.$broadcast` and `$scope.$on` for event dispatching/catching + + + Performances + +Using `$broadcast` might not seem optimum if we consider the description we have above. + +However, it is optimized to only go through branches that have a matching event binding. +(cf. [this post](http://www.bennadel.com/blog/2724-scope-broadcast-is-surprisingly-efficient-in-angularjs.htm))
zeppelin git commit: Revert "[ZEPPELIN-1365] Error of Zeppelin Application in development mode."
Repository: zeppelin Updated Branches: refs/heads/master 802bf5041 -> 04fdfa199 Revert "[ZEPPELIN-1365] Error of Zeppelin Application in development mode." This reverts commit db7c11d3b62a8066b0138fd9700731c953cec1a5. Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/04fdfa19 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/04fdfa19 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/04fdfa19 Branch: refs/heads/master Commit: 04fdfa199654d86ad967421db0ab91735177edfa Parents: 802bf50 Author: Damien CORNEAUAuthored: Tue Sep 13 16:41:00 2016 +0900 Committer: Damien CORNEAU Committed: Tue Sep 13 16:41:00 2016 +0900 -- .../zeppelin/interpreter/remote/RemoteInterpreterServer.java | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/04fdfa19/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java -- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java index 7ddb928..a0890a3 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java @@ -34,7 +34,6 @@ import org.apache.zeppelin.display.*; import org.apache.zeppelin.helium.*; import org.apache.zeppelin.interpreter.*; import org.apache.zeppelin.interpreter.InterpreterResult.Code; -import org.apache.zeppelin.interpreter.dev.ZeppelinDevServer; import org.apache.zeppelin.interpreter.thrift.*; import org.apache.zeppelin.resource.*; import org.apache.zeppelin.scheduler.Job; @@ -134,11 +133,7 @@ public class RemoteInterpreterServer public static void main(String[] args) throws TTransportException, InterruptedException { - -int port = ZeppelinDevServer.DEFAULT_TEST_INTERPRETER_PORT; -if (args.length > 0) { - port = Integer.parseInt(args[0]); -} +int port = Integer.parseInt(args[0]); RemoteInterpreterServer remoteInterpreterServer = new RemoteInterpreterServer(port); remoteInterpreterServer.start(); remoteInterpreterServer.join();
zeppelin git commit: ZEPPELIN-1400. Use relative path to the interpreter setting page
Repository: zeppelin Updated Branches: refs/heads/branch-0.6 074ce6f97 -> 1dda83b42 ZEPPELIN-1400. Use relative path to the interpreter setting page ### What is this PR for? Change the url of interpreter page to relative path ### What type of PR is it? [Improvement] ### Todos * [ ] - Task ### What is the Jira issue? * https://issues.apache.org/jira/browse/ZEPPELIN-1400 ### How should this be tested? Build it and open interpreter page. ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Jeff ZhangCloses #1417 from zjffdu/ZEPPELIN-1400 and squashes the following commits: 70c90d5 [Jeff Zhang] ZEPPELIN-1400. Use relative path to the interpreter setting page (cherry picked from commit 70bec2b2e56b6540f4a101a31d94aee414de98e5) Signed-off-by: Damien CORNEAU Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/1dda83b4 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/1dda83b4 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/1dda83b4 Branch: refs/heads/branch-0.6 Commit: 1dda83b426a043f1d87a15cad09943aa50615a12 Parents: 074ce6f Author: Jeff Zhang Authored: Thu Sep 8 20:50:13 2016 +0800 Committer: Damien CORNEAU Committed: Sun Sep 11 14:19:17 2016 +0900 -- zeppelin-web/src/app/notebook/notebook.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/1dda83b4/zeppelin-web/src/app/notebook/notebook.html -- diff --git a/zeppelin-web/src/app/notebook/notebook.html b/zeppelin-web/src/app/notebook/notebook.html index 9b60dd7..6296bbb 100644 --- a/zeppelin-web/src/app/notebook/notebook.html +++ b/zeppelin-web/src/app/notebook/notebook.html @@ -26,7 +26,7 @@ limitations under the License. Bind interpreter for this note. Click to Bind/Unbind interpreter. Drag and drop to reorder interpreters. -The first interpreter on the list becomes default. To create/remove interpreters, go to Interpreter menu. +The first interpreter on the list becomes default. To create/remove interpreters, go to Interpreter menu.
zeppelin git commit: ZEPPELIN-1400. Use relative path to the interpreter setting page
Repository: zeppelin Updated Branches: refs/heads/master db99ccb70 -> 70bec2b2e ZEPPELIN-1400. Use relative path to the interpreter setting page ### What is this PR for? Change the url of interpreter page to relative path ### What type of PR is it? [Improvement] ### Todos * [ ] - Task ### What is the Jira issue? * https://issues.apache.org/jira/browse/ZEPPELIN-1400 ### How should this be tested? Build it and open interpreter page. ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Jeff ZhangCloses #1417 from zjffdu/ZEPPELIN-1400 and squashes the following commits: 70c90d5 [Jeff Zhang] ZEPPELIN-1400. Use relative path to the interpreter setting page Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/70bec2b2 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/70bec2b2 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/70bec2b2 Branch: refs/heads/master Commit: 70bec2b2e56b6540f4a101a31d94aee414de98e5 Parents: db99ccb Author: Jeff Zhang Authored: Thu Sep 8 20:50:13 2016 +0800 Committer: Damien CORNEAU Committed: Sun Sep 11 14:18:52 2016 +0900 -- zeppelin-web/src/app/notebook/notebook.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/70bec2b2/zeppelin-web/src/app/notebook/notebook.html -- diff --git a/zeppelin-web/src/app/notebook/notebook.html b/zeppelin-web/src/app/notebook/notebook.html index 9ad7166..4cf6508 100644 --- a/zeppelin-web/src/app/notebook/notebook.html +++ b/zeppelin-web/src/app/notebook/notebook.html @@ -26,7 +26,7 @@ limitations under the License. Bind interpreter for this note. Click to Bind/Unbind interpreter. Drag and drop to reorder interpreters. -The first interpreter on the list becomes default. To create/remove interpreters, go to Interpreter menu. +The first interpreter on the list becomes default. To create/remove interpreters, go to Interpreter menu.
svn commit: r1759939 - in /zeppelin/site/docs/0.7.0-SNAPSHOT: development/writingzeppelininterpreter.html index.html
Author: corneadoug Date: Fri Sep 9 04:44:50 2016 New Revision: 1759939 URL: http://svn.apache.org/viewvc?rev=1759939=rev Log: Update 0.7 doc with proper contribution guidelines links Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/development/writingzeppelininterpreter.html zeppelin/site/docs/0.7.0-SNAPSHOT/index.html Modified: zeppelin/site/docs/0.7.0-SNAPSHOT/development/writingzeppelininterpreter.html URL: http://svn.apache.org/viewvc/zeppelin/site/docs/0.7.0-SNAPSHOT/development/writingzeppelininterpreter.html?rev=1759939=1759938=1759939=diff == --- zeppelin/site/docs/0.7.0-SNAPSHOT/development/writingzeppelininterpreter.html (original) +++ zeppelin/site/docs/0.7.0-SNAPSHOT/development/writingzeppelininterpreter.html Fri Sep 9 04:44:50 2016 @@ -18,9 +18,9 @@ - - - + + + https://code.jquery.com/jquery-1.10.2.min.js"</a>;> - - - - - - + + + + + + - - + + @@ -54,7 +54,7 @@ - + Zeppelin 0.7.0-SNAPSHOT @@ -65,105 +65,107 @@ Quick Start -What is Apache Zeppelin ? +What is Apache Zeppelin ? Getting Started -Install -Configuration -Explore Zeppelin UI -Tutorial +Install +Configuration +Explore Zeppelin UI +Tutorial Basic Feature Guide -Dynamic Form -Publish your Paragraph -Customize Zeppelin Homepage +Dynamic Form +Publish your Paragraph +Customize Zeppelin Homepage More -Upgrade Zeppelin Version +Upgrade Zeppelin Version Interpreter -Overview +Overview Usage -Interpreter Installation - -Interpreter Dependency Management +Interpreter Installation + +Interpreter Dependency Management Available Interpreters -Alluxio -BigQuery -Cassandra -Elasticsearch -Flink -Geode -HBase -HDFS -Hive -Ignite -JDBC -Lens -Livy -Markdown -Python -Postgresql, HAWQ -R -Scalding -Shell -Spark +Alluxio +BigQuery +Cassandra +Elasticsearch +Flink +Geode +HBase +HDFS +Hive +Ignite +JDBC +Lens +Livy +Markdown +Python +Postgresql, HAWQ +R +Scalding +Shell +Spark Display System Basic Display System -Text -Html -Table +Text +Html +Table Angular API -Angular (backend API) -Angular (frontend API) +Angular (backend API) +Angular (frontend API) More Notebook Storage -Git Storage -S3 Storage -Azure Storage -ZeppelinHub Storage +Git Storage +S3 Storage +Azure Storage +ZeppelinHub Storage REST API -Interpreter API -Notebook API -Configuration API -Credential API +Interpreter API +Notebook API +Configuration API +Credential API Security -Authentication for NGINX -Shiro Authentication -Notebook Authorization -Data Source Authorization +Authenticati
zeppelin git commit: [ZEPPELIN-1414] Remove CONTRIBUTING.md files
Repository: zeppelin Updated Branches: refs/heads/master 9bce03ce0 -> 56bbff3d3 [ZEPPELIN-1414] Remove CONTRIBUTING.md files ### What is this PR for? Following the PR #1356, we now have the contribution documentation to on Apache Zeppelin Website. We can now remove the contributing files from the repository, and replace the links to that documentation. ### What type of PR is it? Documentation ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1414 ### How should this be tested? Just check if there is other CONTRIBUTING.md files and if there is other links to replace ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Damien CORNEAU <cornead...@gmail.com> Closes #1406 from corneadoug/ZEPPELIN-1414 and squashes the following commits: 4347043 [Damien CORNEAU] change a how to contribute link to the webiste in the docs faf3e11 [Damien CORNEAU] Make links to contribution material point to the website cb4b5f7 [Damien CORNEAU] Remove contributing files from RAT 7810f57 [Damien CORNEAU] Remove contributing files Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/56bbff3d Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/56bbff3d Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/56bbff3d Branch: refs/heads/master Commit: 56bbff3d3d7669065ba12b78f326297a64fd61a1 Parents: 9bce03c Author: Damien CORNEAU <cornead...@gmail.com> Authored: Tue Sep 6 17:50:08 2016 +0900 Committer: Damien CORNEAU <cornead...@gmail.com> Committed: Fri Sep 9 08:04:10 2016 +0900 -- .github/PULL_REQUEST_TEMPLATE | 2 +- CONTRIBUTING.md| 228 README.md | 10 +- docs/CONTRIBUTING.md | 94 docs/README.md | 8 +- docs/development/writingzeppelininterpreter.md | 7 +- docs/index.md | 5 +- pom.xml| 14 +- zeppelin-web/CONTRIBUTING.md | 127 --- zeppelin-web/README.md | 2 +- 10 files changed, 22 insertions(+), 475 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/56bbff3d/.github/PULL_REQUEST_TEMPLATE -- diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE index 09c1b3b..526b414 100644 --- a/.github/PULL_REQUEST_TEMPLATE +++ b/.github/PULL_REQUEST_TEMPLATE @@ -1,6 +1,6 @@ ### What is this PR for? A few sentences describing the overall goals of the pull request's commits. -First time? Check out the contributing guide - https://github.com/apache/zeppelin/blob/master/CONTRIBUTING.md +First time? Check out the contributing guide - https://zeppelin.apache.org/contribution/contributions.html ### What type of PR is it? http://git-wip-us.apache.org/repos/asf/zeppelin/blob/56bbff3d/CONTRIBUTING.md -- diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 278c36f..000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,228 +0,0 @@ -# How to contribute - -**Zeppelin** is [Apache2 License](https://github.com/apache/zeppelin/blob/master/CONTRIBUTING.md) Software. -Contributing to Zeppelin (Source code, Documents, Image, Website) means you agree to the Apache2 License. - -1. Make sure your issue is not already in the [Jira issue tracker](https://issues.apache.org/jira/browse/ZEPPELIN) -2. If not, create a ticket describing the change you're proposing in the [Jira issue tracker](https://issues.apache.org/jira/browse/ZEPPELIN) -3. Contribute your patch via Pull Request. - -Before you start, please read the [Code of Conduct](http://www.apache.org/foundation/policies/conduct.html) carefully, familiarize yourself with it and refer to it whenever you need it. - -For those of you who are not familiar with Apache project, understanding [How it works](http://www.apache.org/foundation/how-it-works.html) would be quite helpful. - -## Creating a Pull Request -In order to make the review process easier, please follow this template when making a Pull Request: - -``` -### What is this PR for? -A few sentences describing the overall goals of the pull request's commits. -First time? Check out the contributing guide - https://github.com/apache/zeppelin/blob/master/CONTRIBUTING.md - -### What type of PR is it? -[Bug Fix | Improvement | Feature | Documentation | Hot Fix | Refactoring] - -### Todos -* [ ] - Task - -### What is the Jira issue? -* Open an issue on Jira https://i
zeppelin git commit: Update Zeppelin Website building instructions
Repository: zeppelin Updated Branches: refs/heads/gh-pages 97810a07f -> e53101f87 Update Zeppelin Website building instructions ### What is this PR for? Usually in order to push jekyll code to github pages, it will compile using the `--safe` One drawback is that you cannot use any plugins. After working on PR #1356 and introduction a plugin, using the build line with `--safe` specified in the README is failing. However in our case, we are not forced to use that flag, since we are sending the compiled website directly to the Apache SVN, and I was able to confirm that fact when I sent the updated website to the SVN and it was rendered correctly Also since plugins like Google Analytics needs to be activated only in production we are adding a special production environment option to add `JEKYLL_ENV=production` ### What type of PR is it? Documentation ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Damien CORNEAU <cornead...@gmail.com> Closes #1405 from corneadoug/update/buildCommandLine and squashes the following commits: a5652b1 [Damien CORNEAU] Change also in the website contribution guide 08b46e5 [Damien CORNEAU] Update to handle the production flag acd0b04 [Damien CORNEAU] Remove --safe from building instruction Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/e53101f8 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/e53101f8 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/e53101f8 Branch: refs/heads/gh-pages Commit: e53101f8789e1378ab04e003f80775c0758635d6 Parents: 97810a0 Author: Damien CORNEAU <cornead...@gmail.com> Authored: Wed Sep 7 15:32:06 2016 +0900 Committer: Damien CORNEAU <cornead...@gmail.com> Committed: Wed Sep 7 19:47:15 2016 +0900 -- contribution/documentation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e53101f8/contribution/documentation.md -- diff --git a/contribution/documentation.md b/contribution/documentation.md index 0b9ec5b..db464fd 100644 --- a/contribution/documentation.md +++ b/contribution/documentation.md @@ -171,7 +171,7 @@ If you're going to create new pages, there are some spots you need to add the lo ``` # go to /docs under Zeppelin source -bundle exec jekyll build --safe +JEKYLL_ENV=production bundle exec jekyll build ``` 2. checkout ASF repo
svn commit: r1759363 [2/2] - in /zeppelin/site: ./ assets/themes/zeppelin/css/ assets/themes/zeppelin/img/ contribution/ contribution/zeppelinweb/ releases/
Modified: zeppelin/site/releases/zeppelin-release-0.5.6-incubating.html URL: http://svn.apache.org/viewvc/zeppelin/site/releases/zeppelin-release-0.5.6-incubating.html?rev=1759363=1759362=1759363=diff == --- zeppelin/site/releases/zeppelin-release-0.5.6-incubating.html (original) +++ zeppelin/site/releases/zeppelin-release-0.5.6-incubating.html Tue Sep 6 05:19:46 2016 @@ -70,34 +70,48 @@ - - Community - + + +Community + + - - Download - + + + + + + + + + + + +Download + + + @@ -106,20 +120,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -304,22 +345,6 @@ More than 110 issues has been resolved.< - - - - (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ - (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), - m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) - })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); - - ga('create', 'UA-45176241-5', 'zeppelin.apache.org'); - ga('require', 'linkid', 'linkid.js'); - ga('send', 'pageview'); - - - - - Modified: zeppelin/site/releases/zeppelin-release-0.6.0.html URL: http://svn.apache.org/viewvc/zeppelin/site/releases/zeppelin-release-0.6.0.html?rev=1759363=1759362=1759363=diff == --- zeppelin/site/releases/zeppelin-release-0.6.0.html (original) +++ zeppelin/site/releases/zeppelin-release-0.6.0.html Tue Sep 6 05:19:46 2016 @@ -70,34 +70,48 @@ - - Community - + + +Community + + - - Download - + + + + + + + + + + + +Download + + + @@ -106,20 +120,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -300,22 +341,6 @@ You can visit https://issues.ap - - - - (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ - (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), - m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) - })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); - - ga('create', 'UA-45176241-5', 'zeppelin.apache.org'); - ga('require', 'linkid', 'linkid.js'); - ga('send', 'pageview'); - - - - - Modified: zeppelin/site/releases/zeppelin-release-0.6.1.html URL: http://svn.apache.org/viewvc/zeppelin/site/releases/zeppelin-release-0.6.1.html?rev=1759363=1759362=1759363=diff == --- zeppelin/site/releases/zeppelin-release-0.6.1.html (original) +++ zeppelin/site/releases/zeppelin-release-0.6.1.html Tue Sep 6 05:19:46 2016 @@ -70,34 +70,48 @@ - - Community - + + +Community + + - - Download - + + + + + + + + + + + +Download + + + @@ -106,20 +120,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -257,22 +298,6 @@ You can visit https://issues.ap - - - - (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ - (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new
zeppelin git commit: [ZEPPELIN-1346] Add contribution guidelines to the website
Repository: zeppelin Updated Branches: refs/heads/gh-pages 9c9e6bc06 -> 9647ba493 [ZEPPELIN-1346] Add contribution guidelines to the website ### What is this PR for? Recreation of #1354 This PR is bringing Contribution guidelines to the website. We also introduce a sidemenu on those pages allowing to create additional content. As an example, for the Web Application Guidelines, we added a page about "Defining Components" In a different PR, we will remove the contributing markdown, and change the links in the repository to the website. The layout of the doc was slightly modified to allow a larger documentation at max size. It was also modified to accommodate better on smaller screens. ### What type of PR is it? Documentation ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1346 ### How should this be tested? Build the website locally and visit the community page ### Screenshots (if appropriate) ![screen shot 2016-08-23 at 3 50 41 pm](https://cloud.githubusercontent.com/assets/710411/17882774/8da96b86-6949-11e6-8789-fed606b64fd8.png) https://cloud.githubusercontent.com/assets/710411/18113150/7bb2a152-6f68-11e6-8678-667c2d4f07ef.png;> Layout update (Before / After) Navbar Bug fix https://cloud.githubusercontent.com/assets/710411/18113174/a374ee84-6f68-11e6-8878-a8eb7b564bd7.png;> https://cloud.githubusercontent.com/assets/710411/18113161/9a280b0e-6f68-11e6-8dc5-1656b5bc86b1.png;> Small Device Margin Improvement https://cloud.githubusercontent.com/assets/710411/18113176/a590f74e-6f68-11e6-8468-18274413be28.png;> https://cloud.githubusercontent.com/assets/710411/18113168/9e904d5a-6f68-11e6-9a2e-2536cbf7a37f.png;> Content Width Change https://cloud.githubusercontent.com/assets/710411/18113180/a7fc954c-6f68-11e6-8d58-08afb54549c1.png;> https://cloud.githubusercontent.com/assets/710411/18113169/a0d71aee-6f68-11e6-8654-3f124bd2a71b.png;> ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Damien CORNEAU <cornead...@gmail.com> Author: AhyoungRyu <fbdkdu...@hanmail.net> Author: CORNEAU Damien <cornead...@gmail.com> Closes #1356 from corneadoug/add/ContributeCategory and squashes the following commits: 1a45b92 [Damien CORNEAU] Improve margin for small devices 9169c68 [Damien CORNEAU] Improve wording and spacing in contribution docs d31cf3f [Damien CORNEAU] Improve CSS for the content a469d52 [Damien CORNEAU] Extend pages_list to support multi group 79d15a3 [Damien CORNEAU] Add Contribution Guidelines to SubMenu 934afd9 [Damien CORNEAU] Change Zeppelin to Apache Zeppelin in general.md 2d62d20 [CORNEAU Damien] Merge pull request #6 from AhyoungRyu/add/ContributeCategory-ahyoung e34fc64 [Damien CORNEAU] fix typo in front-end doc a4c924b [AhyoungRyu] Remove 'menu' property e0b4c8d [Damien CORNEAU] change name of good practice file 9882670 [Damien CORNEAU] Allows contribution page without side Menu 318c4c1 [AhyoungRyu] Add section for 'For committers only' 8f69f28 [Damien CORNEAU] Add GUI integration tests CLI e7209ea [AhyoungRyu] Add docs contribution guide 94d653b [Damien CORNEAU] Fix typos 81493ab [Damien CORNEAU] Change Side Menu style 666f3ec [Damien CORNEAU] Add first Zeppelin-web best practices page 306ae06 [Damien CORNEAU] Add zeppelin-web GPG menu c933c19 [Damien CORNEAU] Add zeppelin-web contribution page 5f7e2bd [Damien CORNEAU] Add a side menu template acc68b5 [Damien CORNEAU] Add contribution Guidelines to the website cb87608 [Damien CORNEAU] Add forgotten license headers 06238fb [Damien CORNEAU] Modify the Community page Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/9647ba49 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/9647ba49 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/9647ba49 Branch: refs/heads/gh-pages Commit: 9647ba493e2cc047e7ebe718f6edf2ab9abaa9d5 Parents: 9c9e6bc Author: Damien CORNEAU <cornead...@gmail.com> Authored: Wed Aug 31 10:36:33 2016 +0900 Committer: Damien CORNEAU <cornead...@gmail.com> Committed: Tue Sep 6 13:12:15 2016 +0900 -- _includes/JB/pages_list | 42 +-- _includes/sub-views/community/contribute.md | 41 +++ _includes/sub-views/community/mailinglist.md| 27 ++ _includes/themes/zeppelin/sideMenu.html | 16 ++ _layouts/sideMenu.html | 5 + _plugins/markdown_tag.rb| 23 ++ assets/themes/zeppelin/css/style.css| 114 +--- community.md| 20 +- contribution/contributions.md | 257 +++ contribution/documentation.md | 182 + contribution/webapplication.md | 161 +++
zeppelin git commit: [ZEPPELIN-1391][Interpreters] print error while existing registedInterpreter with the same key but different settings
Repository: zeppelin Updated Branches: refs/heads/master c580a82ad -> 323aa1883 [ZEPPELIN-1391][Interpreters] print error while existing registedInterpreter with the same key but different settings ### What is this PR for? print error while existing registedInterpreter with the same key but different settings. In order to compare the property Map in the Interpreter easily, I override the `equals` method in `InterpreterProperty` class. (and `hashCode` at the same time) and I fix a small error in `InterpreterProperty.toString()`, its result forgot `}` in the end. ### What type of PR is it? Improvement ### Todos ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1391 ### 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: WeichenXuCloses #1382 from WeichenXu123/interpreter_key_error_check and squashes the following commits: 4ef032e [WeichenXu] print error while existing registedInterpreter with the same key but different settings Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/323aa188 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/323aa188 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/323aa188 Branch: refs/heads/master Commit: 323aa18830ce20ddd8bae25b630661548c89a97c Parents: c580a82 Author: WeichenXu Authored: Sun Aug 28 00:10:50 2016 -0700 Committer: Damien CORNEAU Committed: Thu Sep 1 17:01:30 2016 +0900 -- .../org/apache/zeppelin/interpreter/Interpreter.java| 6 +- .../zeppelin/interpreter/InterpreterProperty.java | 12 ++-- 2 files changed, 15 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/323aa188/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/Interpreter.java -- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/Interpreter.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/Interpreter.java index 07f9cba..42caafd 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/Interpreter.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/Interpreter.java @@ -345,10 +345,14 @@ public abstract class Interpreter { } public static void register(RegisteredInterpreter registeredInterpreter) { -// TODO(jongyoul): Error should occur when two same interpreter key with different settings String interpreterKey = registeredInterpreter.getInterpreterKey(); if (!registeredInterpreters.containsKey(interpreterKey)) { registeredInterpreters.put(interpreterKey, registeredInterpreter); +} else { + RegisteredInterpreter existInterpreter = registeredInterpreters.get(interpreterKey); + if (!existInterpreter.getProperties().equals(registeredInterpreter.getProperties())) { +logger.error("exist registeredInterpreter with the same key but has different settings."); + } } } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/323aa188/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterProperty.java -- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterProperty.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterProperty.java index 5067586..c69de5d 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterProperty.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterProperty.java @@ -70,6 +70,14 @@ public class InterpreterProperty { this.description = description; } + public int hashCode() { +return this.toString().hashCode(); + } + + public boolean equals(Object o) { +return this.toString().equals(o.toString()); + } + public String getValue() { if (envName != null && !envName.isEmpty()) { String envValue = System.getenv().get(envName); @@ -89,7 +97,7 @@ public class InterpreterProperty { @Override public String toString() { -return String.format("{envName=%s, propertyName=%s, defaultValue=%s, description=%20s", envName, -propertyName, defaultValue, description); +return String.format("{envName=%s, propertyName=%s, defaultValue=%s, description=%20s}", +envName, propertyName, defaultValue, description); } }
zeppelin git commit: [ZEPPELIN-1365] Error of Zeppelin Application in development mode.
Repository: zeppelin Updated Branches: refs/heads/branch-0.6 9a28d31f7 -> db7c11d3b [ZEPPELIN-1365] Error of Zeppelin Application in development mode. ### What is this PR for? This PR fixes the bug of running application in development mode. ### What type of PR is it? Bug Fix ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1365 ### How should this be tested? 1. run zeppelin 2. run org.apache.zeppelin.interpreter.dev.ZeppelinApplicationDevServer in development mode. (http://zeppelin.apache.org/docs/0.7.0-SNAPSHOT/development/writingzeppelinapplication.html) 3. and run paragraph like screenshot. ### Screenshots (if appropriate) ![image](https://cloud.githubusercontent.com/assets/3348133/17935588/d95ec2de-6a56-11e6-84d9-19030984411d.png) ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: astroshimCloses #1358 from astroshim/ZEPPELIN-1365 and squashes the following commits: 9f640e5 [astroshim] add argument check. (cherry picked from commit c580a82ad54a5f165dffa2c590c1991375fffb75) Signed-off-by: Damien CORNEAU Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/db7c11d3 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/db7c11d3 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/db7c11d3 Branch: refs/heads/branch-0.6 Commit: db7c11d3b62a8066b0138fd9700731c953cec1a5 Parents: 9a28d31 Author: astroshim Authored: Wed Aug 24 23:52:45 2016 +0900 Committer: Damien CORNEAU Committed: Thu Sep 1 16:30:11 2016 +0900 -- .../zeppelin/interpreter/remote/RemoteInterpreterServer.java | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/db7c11d3/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java -- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java index 6b4edc4..8f49777 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java @@ -32,6 +32,7 @@ import org.apache.thrift.transport.TTransportException; import org.apache.zeppelin.display.*; import org.apache.zeppelin.interpreter.*; import org.apache.zeppelin.interpreter.InterpreterResult.Code; +import org.apache.zeppelin.interpreter.dev.ZeppelinDevServer; import org.apache.zeppelin.interpreter.thrift.*; import org.apache.zeppelin.resource.*; import org.apache.zeppelin.scheduler.Job; @@ -124,7 +125,11 @@ public class RemoteInterpreterServer public static void main(String[] args) throws TTransportException, InterruptedException { -int port = Integer.parseInt(args[0]); + +int port = ZeppelinDevServer.DEFAULT_TEST_INTERPRETER_PORT; +if (args.length > 0) { + port = Integer.parseInt(args[0]); +} RemoteInterpreterServer remoteInterpreterServer = new RemoteInterpreterServer(port); remoteInterpreterServer.start(); remoteInterpreterServer.join();
zeppelin git commit: [ZEPPELIN-1365] Error of Zeppelin Application in development mode.
Repository: zeppelin Updated Branches: refs/heads/master d93fb7361 -> c580a82ad [ZEPPELIN-1365] Error of Zeppelin Application in development mode. ### What is this PR for? This PR fixes the bug of running application in development mode. ### What type of PR is it? Bug Fix ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1365 ### How should this be tested? 1. run zeppelin 2. run org.apache.zeppelin.interpreter.dev.ZeppelinApplicationDevServer in development mode. (http://zeppelin.apache.org/docs/0.7.0-SNAPSHOT/development/writingzeppelinapplication.html) 3. and run paragraph like screenshot. ### Screenshots (if appropriate) ![image](https://cloud.githubusercontent.com/assets/3348133/17935588/d95ec2de-6a56-11e6-84d9-19030984411d.png) ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: astroshimCloses #1358 from astroshim/ZEPPELIN-1365 and squashes the following commits: 9f640e5 [astroshim] add argument check. Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/c580a82a Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/c580a82a Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/c580a82a Branch: refs/heads/master Commit: c580a82ad54a5f165dffa2c590c1991375fffb75 Parents: d93fb73 Author: astroshim Authored: Wed Aug 24 23:52:45 2016 +0900 Committer: Damien CORNEAU Committed: Thu Sep 1 16:27:41 2016 +0900 -- .../zeppelin/interpreter/remote/RemoteInterpreterServer.java | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c580a82a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java -- diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java index 1730265..57dd768 100644 --- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java +++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterServer.java @@ -34,6 +34,7 @@ import org.apache.zeppelin.display.*; import org.apache.zeppelin.helium.*; import org.apache.zeppelin.interpreter.*; import org.apache.zeppelin.interpreter.InterpreterResult.Code; +import org.apache.zeppelin.interpreter.dev.ZeppelinDevServer; import org.apache.zeppelin.interpreter.thrift.*; import org.apache.zeppelin.resource.*; import org.apache.zeppelin.scheduler.Job; @@ -133,7 +134,11 @@ public class RemoteInterpreterServer public static void main(String[] args) throws TTransportException, InterruptedException { -int port = Integer.parseInt(args[0]); + +int port = ZeppelinDevServer.DEFAULT_TEST_INTERPRETER_PORT; +if (args.length > 0) { + port = Integer.parseInt(args[0]); +} RemoteInterpreterServer remoteInterpreterServer = new RemoteInterpreterServer(port); remoteInterpreterServer.start(); remoteInterpreterServer.join();
zeppelin git commit: ZEPPELIN-1384. Spark interpreter binary compatibility to scala 2.10 / 2.11 broken
Repository: zeppelin Updated Branches: refs/heads/master df2e77de9 -> d93fb7361 ZEPPELIN-1384. Spark interpreter binary compatibility to scala 2.10 / 2.11 broken ### What is this PR for? As described in ZEPPELIN-1384, we may hit the following error when running zeppelin on spark 1.6 if we build zeppelin this way ``` dev/change_scala_version.sh 2.11 mvn -DskipTests -Drat.skip=true -Pscala-2.11 -Pspark-2.0 -Dspark.version=2.0.0 -Phadoop-2.6 -Pyarn -Ppyspark -Psparkr clean package ``` ``` java.lang.NoSuchMethodError: scala.runtime.VolatileByteRef.create(B)Lscala/runtime/VolatileByteRef; at scala.xml.MetaData$.iterate$1(MetaData.scala:39) at scala.xml.MetaData$.normalize(MetaData.scala:45) at scala.xml.Elem.(Elem.scala:99) at org.apache.spark.ui.jobs.StagePage$$anonfun$26.apply(StagePage.scala:57) at org.apache.spark.ui.jobs.StagePage$$anonfun$26.apply(StagePage.scala:55) at scala.collection.TraversableLike$$anonfun$map$1.apply(TraversableLike.scala:244) at scala.collection.TraversableLike$$anonfun$map$1.apply(TraversableLike.scala:244) at scala.collection.immutable.List.foreach(List.scala:318) at scala.collection.TraversableLike$class.map(TraversableLike.scala:244) at scala.collection.AbstractTraversable.map(Traversable.scala:105) at org.apache.spark.ui.jobs.StagePage.(StagePage.scala:55) at org.apache.spark.ui.jobs.StagesTab.(StagesTab.scala:34) at org.apache.spark.ui.SparkUI.(SparkUI.scala:57) at org.apache.spark.ui.SparkUI$.create(SparkUI.scala:195) at org.apache.spark.ui.SparkUI$.createLiveUI(SparkUI.scala:146) at org.apache.spark.SparkContext.(SparkContext.scala:473) at org.apache.zeppelin.spark.SparkInterpreter.createSparkContext_1(SparkInterpreter.java:440) at org.apache.zeppelin.spark.SparkInterpreter.createSparkContext(SparkInterpreter.java:354) at org.apache.zeppelin.spark.SparkInterpreter.getSparkContext(SparkInterpreter.java:137) at org.apache.zeppelin.spark.SparkInterpreter.open(SparkInterpreter.java:743) at org.apache.zeppelin.interpreter.LazyOpenInterpreter.open(LazyOpenInterpreter.java:69) at org.apache.zeppelin.interpreter.LazyOpenInterpreter.interpret(LazyOpenInterpreter.java:93) ``` The root cause is that scala-xml is removed from scala 2.11 to a separate library, so here we have class conflict of scala-xml api. In this PR, I make the scope of scala-xml to be provided and also make the scope of scala-library to be provided although it will be override in `ZEPPELIN_HOME/spark/pom.xml` ### What type of PR is it? [Bug Fix] ### Todos * [ ] - Task ### What is the Jira issue? * https://issues.apache.org/jira/browse/ZEPPELIN-1384 ### How should this be tested? Tested manually. Use the following command to build zeppelin and then run it on spark-1.6.2 ``` dev/change_scala_version.sh 2.11 mvn -DskipTests -Drat.skip=true -Pscala-2.11 -Pspark-2.0 -Dspark.version=2.0.0 -Phadoop-2.6 -Pyarn -Ppyspark -Psparkr clean package ``` ### 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: Jeff ZhangCloses #1377 from zjffdu/ZEPPELIN-1384 and squashes the following commits: eb07535 [Jeff Zhang] ZEPPELIN-1384. Spark interpreter binary compatibility to scala 2.10 / 2.11 broken Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/d93fb736 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/d93fb736 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/d93fb736 Branch: refs/heads/master Commit: d93fb7361d73d1cdbf6a551b3892d4dd8c69656d Parents: df2e77d Author: Jeff Zhang Authored: Mon Aug 29 09:58:29 2016 +0800 Committer: Damien CORNEAU Committed: Thu Sep 1 16:21:45 2016 +0900 -- zeppelin-display/pom.xml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/d93fb736/zeppelin-display/pom.xml -- diff --git a/zeppelin-display/pom.xml b/zeppelin-display/pom.xml index c30b061..7631d4f 100644 --- a/zeppelin-display/pom.xml +++ b/zeppelin-display/pom.xml @@ -81,6 +81,7 @@ org.scala-lang scala-library ${scala.version} + provided @@ -99,6 +100,7 @@ org.scala-lang.modules scala-xml_${scala.binary.version} 1.0.2 + provided
zeppelin git commit: [DOC]fix some spelling mistakes
Repository: zeppelin Updated Branches: refs/heads/branch-0.6 1ab5a9d43 -> 7b7216338 [DOC]fix some spelling mistakes ### What is this PR for? fix some spelling mistakes just like this: zepplin -> zeppelin ### What type of PR is it? [Documentation] ### Todos * [ ] - Task ### What is the Jira issue? * No jira created ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Liu XiangCloses #1386 from sloth2012/master and squashes the following commits: fdb4e51 [Liu Xiang] fix some word spell errors (cherry picked from commit 9dc9c7512268b3ab8b5d5b07842bce7350289544) Signed-off-by: Damien CORNEAU Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/7b721633 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/7b721633 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/7b721633 Branch: refs/heads/branch-0.6 Commit: 7b7216338cba63624723d18efdf492aca83d0a51 Parents: 1ab5a9d Author: Liu Xiang Authored: Tue Aug 30 20:51:57 2016 +0800 Committer: Damien CORNEAU Committed: Thu Sep 1 15:53:32 2016 +0900 -- docs/install/install.md | 4 ++-- .../main/java/org/apache/zeppelin/spark/SparkRInterpreter.java | 2 +- .../main/java/org/apache/zeppelin/spark/ZeppelinRContext.java| 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7b721633/docs/install/install.md -- diff --git a/docs/install/install.md b/docs/install/install.md index a47e1c6..92ece74 100644 --- a/docs/install/install.md +++ b/docs/install/install.md @@ -195,8 +195,8 @@ You can configure Apache Zeppelin with both **environment variables** in `conf/z -zepplin-env.sh -zepplin-site.xml +zeppelin-env.sh +zeppelin-site.xml Default value Description http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7b721633/spark/src/main/java/org/apache/zeppelin/spark/SparkRInterpreter.java -- diff --git a/spark/src/main/java/org/apache/zeppelin/spark/SparkRInterpreter.java b/spark/src/main/java/org/apache/zeppelin/spark/SparkRInterpreter.java index 5598f09..0613949 100644 --- a/spark/src/main/java/org/apache/zeppelin/spark/SparkRInterpreter.java +++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkRInterpreter.java @@ -78,7 +78,7 @@ public class SparkRInterpreter extends Interpreter { ZeppelinRContext.setSparkSession(sparkInterpreter.getSparkSession()); } ZeppelinRContext.setSqlContext(sparkInterpreter.getSQLContext()); -ZeppelinRContext.setZepplinContext(sparkInterpreter.getZeppelinContext()); +ZeppelinRContext.setZeppelinContext(sparkInterpreter.getZeppelinContext()); zeppelinR = new ZeppelinR(rCmdPath, sparkRLibPath, port, sparkVersion); try { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7b721633/spark/src/main/java/org/apache/zeppelin/spark/ZeppelinRContext.java -- diff --git a/spark/src/main/java/org/apache/zeppelin/spark/ZeppelinRContext.java b/spark/src/main/java/org/apache/zeppelin/spark/ZeppelinRContext.java index 9ad156e..935410b 100644 --- a/spark/src/main/java/org/apache/zeppelin/spark/ZeppelinRContext.java +++ b/spark/src/main/java/org/apache/zeppelin/spark/ZeppelinRContext.java @@ -33,7 +33,7 @@ public class ZeppelinRContext { ZeppelinRContext.sparkContext = sparkContext; } - public static void setZepplinContext(ZeppelinContext zeppelinContext) { + public static void setZeppelinContext(ZeppelinContext zeppelinContext) { ZeppelinRContext.zeppelinContext = zeppelinContext; }
svn commit: r1758704 - in /zeppelin/site/docs/0.7.0-SNAPSHOT: assets/themes/zeppelin/css/style.css install/install.html
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
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: AhyoungRyuCloses #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-1040] Show the time when the result is updated
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-gCloses #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-1178] Tooltip: Show chart type when hovering over chart icon
Repository: zeppelin Updated Branches: refs/heads/master 32f35e2a7 -> b7f918a7b [ZEPPELIN-1178] Tooltip: Show chart type when hovering over chart icon ### What is this PR for? A usability improvement: Added tooltips for the chart icons in Zeppelin paragraphs, showing the chart types when hovering over the chart icons. ### What type of PR is it? Improvement ### Todos NA ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1178 ### How should this be tested? 1. Deploy Zeppelin and navigate to zeppelin tutorial 2. Run a paragraph and hover over the chart icon buttons to see the tooltip getting displayed. ### 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: vensantCloses #1362 from vensant/ZEPPELIN-1178 and squashes the following commits: 38fcda8 [vensant] changed the tooltip names as per the review comment from the community 8a85449 [vensant] Added tooltips for the chart icons in Zeppelin paragraphs, showing the chart types when hovering over the chart icons Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/b7f918a7 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/b7f918a7 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/b7f918a7 Branch: refs/heads/master Commit: b7f918a7b81602f192c7cdd4b558f9167013b691 Parents: 32f35e2 Author: vensant Authored: Fri Aug 26 15:09:20 2016 +0530 Committer: Damien CORNEAU Committed: Sat Aug 27 16:25:53 2016 +0900 -- .../paragraph/paragraph-chart-selector.html | 21 +--- 1 file changed, 14 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/b7f918a7/zeppelin-web/src/app/notebook/paragraph/paragraph-chart-selector.html -- diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph-chart-selector.html b/zeppelin-web/src/app/notebook/paragraph/paragraph-chart-selector.html index e2e4e35..eab741b 100644 --- a/zeppelin-web/src/app/notebook/paragraph/paragraph-chart-selector.html +++ b/zeppelin-web/src/app/notebook/paragraph/paragraph-chart-selector.html @@ -20,37 +20,44 @@ limitations under the License. + ng-click="setGraphMode('table', true)" + tooltip="Table" tooltip-placement="bottom"> + ng-click="setGraphMode('multiBarChart', true)" + tooltip="Bar Chart" tooltip-placement="bottom"> + ng-click="setGraphMode('pieChart', true)" + tooltip="Pie Chart" tooltip-placement="bottom"> + ng-click="setGraphMode('stackedAreaChart', true)" + tooltip="Area Chart" tooltip-placement="bottom"> + ng-click="paragraph.config.graph.lineWithFocus ? setGraphMode('lineWithFocusChart', true) : setGraphMode('lineChart', true)" + tooltip="Line Chart" tooltip-placement="bottom"> + ng-click="setGraphMode('scatterChart', true)" + tooltip="Scatter Chart" tooltip-placement="bottom"> + ng-click="setGraphMode('map', true)" + tooltip="Map" tooltip-placement="bottom">
zeppelin git commit: [ZEPPELIN-1333] prevent calling runParagraph() on shift-enter event
Repository: zeppelin Updated Branches: refs/heads/branch-0.6 d873afdfe -> c1bef [ZEPPELIN-1333] prevent calling runParagraph() on shift-enter event ### What is this PR for? when shift-enter is pressed in text box of dynamic form, the paragraph runs twice. 1) ng-enter event handler 2) global event handler blocking shift-enter in ng-enter event handler, this issue could be resolved. ### What type of PR is it? [Bug Fix] ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1333 ### How should this be tested? ![image](https://cloud.githubusercontent.com/assets/6119284/17725846/af8775b4-6489-11e6-912f-99dbc8a050bb.png) the test case above should return 1 with enter event and shift-enter event. Author: Steven HanCloses #1336 from nazgul33/master and squashes the following commits: 54c5142 [Steven Han] [ZEPPELIN-1333] prevent calling runParagraph() on shift-enter event (cherry picked from commit 371fa76cd558cf401322bc7fdd3fe266c3fd3741) Signed-off-by: Damien CORNEAU Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/c1be Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/c1be Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/c1be Branch: refs/heads/branch-0.6 Commit: c1bef1ceac8c69397dce7c8ee6adc5cd5548 Parents: d873afd Author: Steven Han Authored: Wed Aug 17 13:59:54 2016 +0900 Committer: Damien CORNEAU Committed: Fri Aug 19 18:04:31 2016 +0900 -- zeppelin-web/src/components/ngenter/ngenter.directive.js | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c1be/zeppelin-web/src/components/ngenter/ngenter.directive.js -- diff --git a/zeppelin-web/src/components/ngenter/ngenter.directive.js b/zeppelin-web/src/components/ngenter/ngenter.directive.js index f284c69..89826c9 100644 --- a/zeppelin-web/src/components/ngenter/ngenter.directive.js +++ b/zeppelin-web/src/components/ngenter/ngenter.directive.js @@ -17,9 +17,11 @@ angular.module('zeppelinWebApp').directive('ngEnter', function() { return function(scope, element, attrs) { element.bind('keydown keypress', function(event) { if (event.which === 13) { -scope.$apply(function() { - scope.$eval(attrs.ngEnter); -}); +if (!event.shiftKey) { + scope.$apply(function() { +scope.$eval(attrs.ngEnter); + }); +} event.preventDefault(); } });
zeppelin git commit: [ZEPPELIN-1333] prevent calling runParagraph() on shift-enter event
Repository: zeppelin Updated Branches: refs/heads/master ff2465b9d -> 371fa76cd [ZEPPELIN-1333] prevent calling runParagraph() on shift-enter event ### What is this PR for? when shift-enter is pressed in text box of dynamic form, the paragraph runs twice. 1) ng-enter event handler 2) global event handler blocking shift-enter in ng-enter event handler, this issue could be resolved. ### What type of PR is it? [Bug Fix] ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1333 ### How should this be tested? ![image](https://cloud.githubusercontent.com/assets/6119284/17725846/af8775b4-6489-11e6-912f-99dbc8a050bb.png) the test case above should return 1 with enter event and shift-enter event. Author: Steven HanCloses #1336 from nazgul33/master and squashes the following commits: 54c5142 [Steven Han] [ZEPPELIN-1333] prevent calling runParagraph() on shift-enter event Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/371fa76c Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/371fa76c Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/371fa76c Branch: refs/heads/master Commit: 371fa76cd558cf401322bc7fdd3fe266c3fd3741 Parents: ff2465b Author: Steven Han Authored: Wed Aug 17 13:59:54 2016 +0900 Committer: Damien CORNEAU Committed: Fri Aug 19 18:03:08 2016 +0900 -- zeppelin-web/src/components/ngenter/ngenter.directive.js | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/371fa76c/zeppelin-web/src/components/ngenter/ngenter.directive.js -- diff --git a/zeppelin-web/src/components/ngenter/ngenter.directive.js b/zeppelin-web/src/components/ngenter/ngenter.directive.js index f284c69..89826c9 100644 --- a/zeppelin-web/src/components/ngenter/ngenter.directive.js +++ b/zeppelin-web/src/components/ngenter/ngenter.directive.js @@ -17,9 +17,11 @@ angular.module('zeppelinWebApp').directive('ngEnter', function() { return function(scope, element, attrs) { element.bind('keydown keypress', function(event) { if (event.which === 13) { -scope.$apply(function() { - scope.$eval(attrs.ngEnter); -}); +if (!event.shiftKey) { + scope.$apply(function() { +scope.$eval(attrs.ngEnter); + }); +} event.preventDefault(); } });
svn commit: r1756710 - in /zeppelin/site: assets.html assets/themes/zeppelin/img/zeppelin_classic_logo.png assets/themes/zeppelin/img/zeppelin_svg_logo.svg atom.xml rss.xml
Author: corneadoug Date: Thu Aug 18 05:09:24 2016 New Revision: 1756710 URL: http://svn.apache.org/viewvc?rev=1756710=rev Log: add missing assets file Added: zeppelin/site/assets.html zeppelin/site/assets/themes/zeppelin/img/zeppelin_classic_logo.png (with props) zeppelin/site/assets/themes/zeppelin/img/zeppelin_svg_logo.svg (with props) Modified: zeppelin/site/atom.xml zeppelin/site/rss.xml Added: zeppelin/site/assets.html URL: http://svn.apache.org/viewvc/zeppelin/site/assets.html?rev=1756710=auto == --- zeppelin/site/assets.html (added) +++ zeppelin/site/assets.html Thu Aug 18 05:09:24 2016 @@ -0,0 +1,229 @@ + + + + + +Assets + + + + + + + + + + + + + + + + + +https://code.jquery.com/jquery-1.10.2.min.js"</a>;> + + + + + + + + + + + + + +Toggle navigation + + + + + + +Apache Zeppelin + + + + + + + + + + + + + + + + + + + + + + Community + + + + + + + + Download + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Docs + +Release +0.6.0 +0.5.6-incubating +0.5.5-incubating +0.5.0-incubating + +Snapshot(development) +0.7.0-SNAPSHOT + + + +https://github.com/apache/incubator-zeppelin;>GitHub + + + + Apache + +http://www.apache.org/foundation/how-it-works.html;>Apache Software Foundation +http://www.apache.org/licenses/;>Apache License +http://www.apache.org/foundation/sponsorship.html;>Sponsorship +Assets +http://www.apache.org/foundation/thanks.html;>Thanks + + + + + + + + + + + + + + + + + + +Apache Zeppelin Logo + +Here you will find links and informations regarding the Apache Zeppelin logo + + + + + + + + +Font used: https://www.google.com/fonts/specimen/Patua%20One;>Patua One +Color: #3071A9 +PNG format +SVG format + + + + + + + + + + + + + + + + + + (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) + })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); + + ga('create', 'UA-45176241-5', 'zeppelin.incubator.apache.org'); + ga('require', 'linkid', 'linkid.js'); + ga('send', 'pageview'); + + + + + + + + Added: zeppelin/site/assets/themes/zeppelin/img/zeppelin_classic_logo.png URL: http://svn.apache.org/viewvc/zeppelin/site/assets/themes/zeppelin/img/zeppelin_classic_logo.png?rev=1756710=auto == Binary file - no diff available. Propchange: zeppelin/site/assets/themes/zeppelin/img/zeppelin_classic_logo.png -- svn:mime-type = application/octet-stream Added: zeppelin/site/assets/themes/zeppelin/img/zeppelin_svg_logo.svg URL: http://svn.apache.org/viewvc/zeppelin/site/assets/themes/zeppelin/img/zeppelin_svg_logo.svg?rev=1756710=auto == --- zeppelin/site/assets/themes/zeppelin/img/zeppelin_svg_logo.svg (added) +++ zeppelin/site/assets/themes/zeppelin/img/zeppelin_svg_logo.svg Thu Aug 18 05:09:24 2016 @@ -0,0 +1,77 @@ + + + +http://purl.org/dc/elements/1.1/; + xmlns:cc="http://creativecommons.org/ns#; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg="http://www.w3.org/2000/svg; + xmlns="http://www.w3.org/2000/svg; + xmlns:xlink="http://www.w3.org/1999/xlink; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape; + version="1.1" + width="500" + height="310" + id="svg2" + inkscape:version="0.48.2 r9819" + sodipodi:docname="zeppelin-logo-NORMAL.svg"> + + + +
svn commit: r1756705 - in /zeppelin/site: ./ assets/themes/zeppelin/css/ releases/
Author: corneadoug Date: Thu Aug 18 04:38:10 2016 New Revision: 1756705 URL: http://svn.apache.org/viewvc?rev=1756705=rev Log: Adding Zeppelin Logo Modified: zeppelin/site/assets/themes/zeppelin/css/style.css zeppelin/site/atom.xml zeppelin/site/community.html zeppelin/site/doap.rdf zeppelin/site/download.html zeppelin/site/index.html zeppelin/site/releases/zeppelin-release-0.5.0-incubating.html zeppelin/site/releases/zeppelin-release-0.5.5-incubating.html zeppelin/site/releases/zeppelin-release-0.5.6-incubating.html zeppelin/site/releases/zeppelin-release-0.6.0.html zeppelin/site/rss.xml zeppelin/site/screenshots.html zeppelin/site/sitemap.txt Modified: zeppelin/site/assets/themes/zeppelin/css/style.css URL: http://svn.apache.org/viewvc/zeppelin/site/assets/themes/zeppelin/css/style.css?rev=1756705=1756704=1756705=diff == --- zeppelin/site/assets/themes/zeppelin/css/style.css (original) +++ zeppelin/site/assets/themes/zeppelin/css/style.css Thu Aug 18 04:38:10 2016 @@ -11,6 +11,12 @@ body { letter-spacing: .2px; } +.logopage_container { + display: inline-block; + vertical-align: middle; + margin: 10px 20px; +} + .jumbotron { background-color: #3071a9; } @@ -21,7 +27,7 @@ body { } .jumbotron p { - font-size: 19px; + font-size: 19px; } .jumbotron .btn { @@ -267,7 +273,7 @@ a.anchor { position: absolute; top: 0; left: 0; - bottom: 0; + bottom: 0; } /* */ Modified: zeppelin/site/atom.xml URL: http://svn.apache.org/viewvc/zeppelin/site/atom.xml?rev=1756705=1756704=1756705=diff == --- zeppelin/site/atom.xml (original) +++ zeppelin/site/atom.xml Thu Aug 18 04:38:10 2016 @@ -4,7 +4,7 @@ Apache Zeppelin (incubating) http://zeppelin.incubator.apache.org/; rel="self"/> http://zeppelin.incubator.apache.org"/> - 2016-08-16T09:44:27+02:00 + 2016-08-18T13:32:46+09:00 http://zeppelin.incubator.apache.org The Apache Software Foundation Modified: zeppelin/site/community.html URL: http://svn.apache.org/viewvc/zeppelin/site/community.html?rev=1756705=1756704=1756705=diff == --- zeppelin/site/community.html (original) +++ zeppelin/site/community.html Thu Aug 18 04:38:10 2016 @@ -53,7 +53,7 @@ - + @@ -70,61 +70,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Community @@ -171,10 +116,6 @@ - - - - @@ -184,19 +125,18 @@ Docs Release -0.6.1 0.6.0 0.5.6-incubating 0.5.5-incubating 0.5.0-incubating -Snapshot(development) +Snapshot(development) 0.7.0-SNAPSHOT - + https://github.com/apache/incubator-zeppelin;>GitHub - + Apache @@ -204,8 +144,9 @@ http://www.apache.org/foundation/how-it-works.html;>Apache Software Foundation http://www.apache.org/licenses/;>Apache License http://www.apache.org/foundation/sponsorship.html;>Sponsorship +Assets http://www.apache.org/foundation/thanks.html;>Thanks - + Modified: zeppelin/site/doap.rdf URL: http://svn.apache.org/viewvc/zeppelin/site/doap.rdf?rev=1756705=1756704=1756705=diff == --- zeppelin/site/doap.rdf (original) +++ zeppelin/site/doap.rdf Thu Aug 18 04:38:10 2016 @@ -38,13 +38,6 @@ http://projects.apache.org/category/big-data; /> -0.6.1 -2016-08-15 -0.6.1 - - - - 0.6.0 2016-07-02 0.6.0 Modified: zeppelin/site/download.html URL: http://svn.apache.org/viewvc/zeppelin/site/download.html?rev=1756705=1756704=1756705=diff == --- zeppelin/site/download.html (original) +++ zeppelin/site/download.html Thu Aug 18 04:38:10 2016 @@ -53,7 +53,7 @@ - +
[2/2] zeppelin git commit: Add an Apache Zeppelin Logo section to the website
Add an Apache Zeppelin Logo section to the website ### What is this PR for? This PR is bringing both PNG and SVG format of the logo to the website, as well as a few other infos about color and font used. To do that we add a new page and navigation menu named: More ### What type of PR is it? Documentation ### How should this be tested? Build the website and visit the More menu ### Screenshots (if appropriate) https://cloud.githubusercontent.com/assets/710411/17617666/4c0b9c6c-60b6-11e6-891c-2f2a8d9cf528.png;> ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Damien CORNEAU <cornead...@gmail.com> Closes #1325 from corneadoug/add/logoToWebsite and squashes the following commits: aff775b [Damien CORNEAU] Change the asset page to Apache menu 0d6a927 [Damien CORNEAU] Add more page and Apache Zeppelin logo section Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/a98a66bc Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/a98a66bc Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/a98a66bc Branch: refs/heads/gh-pages Commit: a98a66bc226f091cfba40b692607097806eb8a42 Parents: e722f31 Author: Damien CORNEAU <cornead...@gmail.com> Authored: Tue Aug 16 12:09:52 2016 +0900 Committer: Damien CORNEAU <cornead...@gmail.com> Committed: Thu Aug 18 13:31:44 2016 +0900 -- _includes/themes/zeppelin/_navigation.html | 14 ++-- assets.md | 38 + assets/themes/zeppelin/css/style.css| 10 ++- .../zeppelin/img/zeppelin_classic_logo.png | Bin 0 -> 24056 bytes .../themes/zeppelin/img/zeppelin_svg_logo.svg | 77 +++ 5 files changed, 128 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a98a66bc/_includes/themes/zeppelin/_navigation.html -- diff --git a/_includes/themes/zeppelin/_navigation.html b/_includes/themes/zeppelin/_navigation.html index 226b0a7..1cf5ebd 100644 --- a/_includes/themes/zeppelin/_navigation.html +++ b/_includes/themes/zeppelin/_navigation.html @@ -13,11 +13,6 @@ - -{% assign pages_list = site.pages %} -{% assign group = 'nav-left' %} -{% include JB/pages_list %} - {% assign pages_list = site.pages %} {% assign group = 'nav-right' %} @@ -34,13 +29,13 @@ 0.5.5-incubating 0.5.0-incubating -Snapshot(development) +Snapshot(development) 0.7.0-SNAPSHOT - + https://github.com/apache/incubator-zeppelin;>GitHub - + Apache @@ -48,8 +43,9 @@ http://www.apache.org/foundation/how-it-works.html;>Apache Software Foundation http://www.apache.org/licenses/;>Apache License http://www.apache.org/foundation/sponsorship.html;>Sponsorship +Assets http://www.apache.org/foundation/thanks.html;>Thanks - + http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a98a66bc/assets.md -- diff --git a/assets.md b/assets.md new file mode 100644 index 000..2434f1e --- /dev/null +++ b/assets.md @@ -0,0 +1,38 @@ +--- +layout: page +title: "Assets" +description: "Assets of Apache Zeppelin" +--- + +{% include JB/setup %} + + +### Apache Zeppelin Logo + +Here you will find links and informations regarding the Apache Zeppelin logo + + + + + + + + +Font used: https://www.google.com/fonts/specimen/Patua%20One;>Patua One +Color: #3071A9 +PNG format +SVG format + + http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a98a66bc/assets/themes/zeppelin/css/style.css -- diff --git a/assets/themes/zeppelin/css/style.css b/assets/themes/zeppelin/css/style.css index e318805..482847b 100644 --- a/assets/themes/zeppelin/css/style.css +++ b/assets/themes/zeppelin/css/style.css @@ -11,6 +11,12 @@ body { letter-spacing: .2px; } +.logopage_container { + display: inline-block; + vertical-align: middle; + margin: 10px 20px; +} + .jumbotron { background-color: #3071a9; } @@ -21,7 +27,7 @@ body { } .jumbotron p { - font-size: 19px; + font-size: 19px; } .jumbotron .btn { @@ -267,7 +273,7 @@ a.ancho
[1/2] zeppelin git commit: Add an Apache Zeppelin Logo section to the website
Repository: zeppelin Updated Branches: refs/heads/gh-pages e722f3197 -> a98a66bc2 http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a98a66bc/assets/themes/zeppelin/img/zeppelin_svg_logo.svg -- diff --git a/assets/themes/zeppelin/img/zeppelin_svg_logo.svg b/assets/themes/zeppelin/img/zeppelin_svg_logo.svg new file mode 100755 index 000..9601e5d --- /dev/null +++ b/assets/themes/zeppelin/img/zeppelin_svg_logo.svg @@ -0,0 +1,77 @@ + + + +http://purl.org/dc/elements/1.1/; + xmlns:cc="http://creativecommons.org/ns#; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg="http://www.w3.org/2000/svg; + xmlns="http://www.w3.org/2000/svg; + xmlns:xlink="http://www.w3.org/1999/xlink; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape; + version="1.1" + width="500" + height="310" + id="svg2" + inkscape:version="0.48.2 r9819" + sodipodi:docname="zeppelin-logo-NORMAL.svg"> + + + + + +image/svg+xml +http://purl.org/dc/dcmitype/StillImage; /> + + + + + +
zeppelin git commit: [ZEPPELIN-1220] Add geographical map as visualization option
Repository: zeppelin Updated Branches: refs/heads/master c9d2a2c6c -> 47b193151 [ZEPPELIN-1220] Add geographical map as visualization option ### What is this PR for? Added a 2D [Esri map](https://developers.arcgis.com/javascript/) as a graph option for paragraphs. This makes it easier to visualize relations in geographical data. Pins are plotted at points in specified longitude/latitude columns and customizable column values are shown when pins are clicked. Is this of interest? The angular-esri-map module is used, which is released under the Apache 2.0 license, and the JavaScript API is free to use (see [https://developers.arcgis.com/terms/](https://developers.arcgis.com/terms/)). ### What type of PR is it? Feature ### What is the Jira issue? [ZEPPELIN-1220](https://issues.apache.org/jira/browse/ZEPPELIN-1220) ### How should this be tested? Execute a query in a paragraph and select the map pin from the chart type selector. Set the longitude/latitude (and optionally, pin info) columns, then interact with the map. ### Screenshot ![screenshot](https://cloud.githubusercontent.com/assets/9356790/16997359/1262d786-4e83-11e6-8230-a906fe1da2e9.png) ### Questions: * Does the licenses files need update? __yes.__ For angular-esri-map. * Is there breaking changes for older versions? __no__ * Does this needs documentation? __potentially.__ This feature follows the same layout as the other visualization modes, so users will likely be able to use it easily. However, screenshots of some supported visualizations modes are present in the current documentation. If this PR is merged, it may be desirable to display the map option as well. Interestingly the scatter chart is not included in screenshots in the documentation. Author: Matthew PennyCloses #1210 from mwpenny/esri and squashes the following commits: f21ae26 [Matthew Penny] Re-use variable (as intended) c30b1b7 [Matthew Penny] Decrease top margin for bottom-docked map popups 9f72f6f [Matthew Penny] Display error instead of map when there is no internet connection 5a056c8 [Matthew Penny] Lazy load map CSS 14f8a1f [Matthew Penny] Fit map popup to map a47a86c [Matthew Penny] Add padding to bottom-docked map popups 3c12445 [Matthew Penny] Refactoring 07d6ddb [Matthew Penny] Fix scatter size field height in pivot (accidentally changed) c976515 [Matthew Penny] Remove text from merge conflict fc59b7d [Matthew Penny] Use proper coordinates for map popup ec7f155 [Matthew Penny] Update map height when paragraph is resized fbdd41c [Matthew Penny] Make map pivot fields the same height and hide basemap selection when using other graph modes 00054e9 [Matthew Penny] Disable mouse wheel zooming, and start map zoomed out 75e3d49 [Matthew Penny] Update index.html and karma.conf.js to include angular-esri-map JS efdb889 [Matthew Penny] Add angular-esri-map to license document effcff3 [Matthew Penny] Add basemap selection, and some minor cleanup/renaming 2360947 [Matthew Penny] Add tests 984e2b1 [Matthew Penny] Only update pins after map is loaded, and try to detect latitude and logitude columns in data 26bda50 [Matthew Penny] Fix CSS hiding pins 78285ab [Matthew Penny] Add pin rendering to map based on user pivot selection for data 45858e1 [Matthew Penny] Add Esri ArcGIS map rendering support to paragraphs cf6578e [Matthew Penny] Add map UI button and pivot fields Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/47b19315 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/47b19315 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/47b19315 Branch: refs/heads/master Commit: 47b193151bb762998cc2ae5e4953505f07cb76a2 Parents: c9d2a2c Author: Matthew Penny Authored: Thu Aug 11 15:27:17 2016 -0400 Committer: Damien CORNEAU Committed: Wed Aug 17 14:42:08 2016 +0900 -- zeppelin-distribution/src/bin_license/LICENSE | 1 + zeppelin-web/bower.json | 3 +- zeppelin-web/src/app/app.js | 3 +- .../paragraph/paragraph-chart-selector.html | 5 + .../app/notebook/paragraph/paragraph-graph.html | 8 + .../paragraph/paragraph-graphOptions.html | 15 + .../app/notebook/paragraph/paragraph-pivot.html | 50 +++- .../notebook/paragraph/paragraph.controller.js | 296 ++- .../src/app/notebook/paragraph/paragraph.css| 34 ++- zeppelin-web/src/index.html | 1 + zeppelin-web/test/karma.conf.js | 1 + zeppelin-web/test/spec/controllers/paragraph.js | 2 +- 12 files changed, 409 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/47b19315/zeppelin-distribution/src/bin_license/LICENSE
zeppelin git commit: [ZEPPELIN-1290] Refactor Navbar Controller
Repository: zeppelin Updated Branches: refs/heads/master 7e491f8da -> 3a1ab28df [ZEPPELIN-1290] Refactor Navbar Controller ### What is this PR for? This is a small refactoring to keep this Controller following the [ControllerAs with vm](https://github.com/johnpapa/angular-styleguide/tree/master/a1#controlleras-with-vm) rules, that it was based on. Here is a list of things that were changed and why: * Most of the controller's $scope values & fct (except from the search q) where moved to the vm.The controller is using vm, so storing in $scope to share with the view is not needed. * Functions or Vars that are not used in the view were removed from the vm. (kept private to the controller) * $rootscope functions was moved to `app.js`. I think the need for that function might need to be changed, but for the scope of this PR, we are just moving it to where the $rootScope values are declared. * Gathering vm declaration before the functions and ordered alphabetically * Re-order functions alphabetically * Create `initController ` to regroup all the controller setup. ### What type of PR is it? Refactoring ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1290 ### How should this be tested? You can Just verify that the below Navbar related features are still good: * Search Form * Connected Status * Login button * User Name and its dropdown menu * Notebook list drop-down menu (and filer, folder inside of it) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Damien CORNEAU <cornead...@gmail.com> Author: CORNEAU Damien <cornead...@gmail.com> Author: Prabhjyot Singh <prabhjyotsi...@gmail.com> Closes #1281 from corneadoug/Refactor/navbarCtrl and squashes the following commits: 31f9110 [CORNEAU Damien] Merge pull request #4 from prabhjyotsingh/logoutUserFix 4686a18 [Prabhjyot Singh] CI failure for testGroupPermission 2fde749 [Damien CORNEAU] finish cleaning the controller be18547 [Damien CORNEAU] Remove functions from navbar controller Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/3a1ab28d Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/3a1ab28d Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/3a1ab28d Branch: refs/heads/master Commit: 3a1ab28df7befdac5a2331c35e0fd817f8c9d313 Parents: 7e491f8 Author: Damien CORNEAU <cornead...@gmail.com> Authored: Mon Aug 8 19:35:25 2016 +0900 Committer: Damien CORNEAU <cornead...@gmail.com> Committed: Tue Aug 9 21:02:59 2016 +0900 -- .../zeppelin/integration/AuthenticationIT.java | 2 +- zeppelin-web/src/app/app.controller.js | 8 +- .../src/components/navbar/navbar.controller.js | 91 ++-- zeppelin-web/src/components/navbar/navbar.html | 12 +-- 4 files changed, 58 insertions(+), 55 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/3a1ab28d/zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java -- diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java index ea810cb..ea3f363 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java @@ -124,7 +124,7 @@ public class AuthenticationIT extends AbstractZeppelinIT { userName + "')]")).click(); ZeppelinITUtils.sleep(500, false); driver.findElement(By.xpath("//div[contains(@class, 'navbar-collapse')]//li[contains(.,'" + -userName + "')]//a[@ng-click='logout()']")).click(); +userName + "')]//a[@ng-click='navbar.logout()']")).click(); ZeppelinITUtils.sleep(5000, false); } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/3a1ab28d/zeppelin-web/src/app/app.controller.js -- diff --git a/zeppelin-web/src/app/app.controller.js b/zeppelin-web/src/app/app.controller.js index 8a0466b..ff30b82 100644 --- a/zeppelin-web/src/app/app.controller.js +++ b/zeppelin-web/src/app/app.controller.js @@ -13,7 +13,7 @@ */ 'use strict'; -angular.module('zeppelinWebApp').controller('MainCtrl', function($scope, $rootScope, $window) { +angular.module('zeppelinWebApp').controller('MainCtrl', function($scope, $rootScope, $window, arrayOrderingSrv) { $scope.looknfeel = 'default'; var init = function() { @@ -41,6 +41,12 @@ angular.module('zeppelinWebApp').controller('MainCtrl', f
zeppelin git commit: [BugFix] Show checkbox for "Connect to existing process" on interpreter menu.
Repository: zeppelin Updated Branches: refs/heads/master b00792495 -> 55695c9c3 [BugFix] Show checkbox for "Connect to existing process" on interpreter menu. ### What is this PR for? This PR fixes a bug of showing checkbox for "Connect to existing process" on interpreter menu. ### What type of PR is it? Bug Fix ### How should this be tested? Go to interpreter menu and check if checkbox for "Connect to existing process" exists. ### Screenshots (if appropriate) - before ![image](https://cloud.githubusercontent.com/assets/3348133/17141824/aa316672-5388-11e6-952d-50a3769a01a5.png) - after ![image](https://cloud.githubusercontent.com/assets/3348133/17141840/babfad8c-5388-11e6-9209-e37e252e95b4.png) ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: astroshimCloses #1229 from astroshim/bugfix/showCheckbox and squashes the following commits: 4b3673a [astroshim] add css to interpreter-create page 17fb0d7 [astroshim] change size to px 47ce719 [astroshim] remove height style on the checkbox bbc3283 [astroshim] show checkbox on interpreter menu. Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/55695c9c Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/55695c9c Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/55695c9c Branch: refs/heads/master Commit: 55695c9c31d4b2b9978cd27a19a64c95f682d637 Parents: b007924 Author: astroshim Authored: Sat Aug 6 22:10:51 2016 +0900 Committer: Damien CORNEAU Committed: Sun Aug 7 11:29:47 2016 +0900 -- .../app/interpreter/interpreter-create/interpreter-create.html | 4 ++-- zeppelin-web/src/app/interpreter/interpreter.html| 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/55695c9c/zeppelin-web/src/app/interpreter/interpreter-create/interpreter-create.html -- diff --git a/zeppelin-web/src/app/interpreter/interpreter-create/interpreter-create.html b/zeppelin-web/src/app/interpreter/interpreter-create/interpreter-create.html index 599248b..ea5d98f 100644 --- a/zeppelin-web/src/app/interpreter/interpreter-create/interpreter-create.html +++ b/zeppelin-web/src/app/interpreter/interpreter-create/interpreter-create.html @@ -72,8 +72,8 @@ limitations under the License. - - Connect to existing process + + Connect to existing process http://git-wip-us.apache.org/repos/asf/zeppelin/blob/55695c9c/zeppelin-web/src/app/interpreter/interpreter.html -- diff --git a/zeppelin-web/src/app/interpreter/interpreter.html b/zeppelin-web/src/app/interpreter/interpreter.html index 3c25246..fd88204 100644 --- a/zeppelin-web/src/app/interpreter/interpreter.html +++ b/zeppelin-web/src/app/interpreter/interpreter.html @@ -173,8 +173,8 @@ limitations under the License. - - + + Connect to existing process
zeppelin git commit: [Zeppelin-1229] Add cache buster for zeppelin-web build
Repository: zeppelin Updated Branches: refs/heads/branch-0.6 aa5068f5e -> 13752e202 [Zeppelin-1229] Add cache buster for zeppelin-web build In order to bust the cache when there is changes to the code of zeppelin-web after build, we are adding hashes at the end of the imported .js and .css files we use. Every time there is changes in one of those file, the hash will change and the browser will use new file instead of cached one. Improvement https://issues.apache.org/jira/browse/ZEPPELIN-1229 * Build zeppelin-web once and write down the HASH in `dist/scripts/scripts.HASH.js` * After making a change inside a .js file of the application and building again, the hash in `dist/scripts/scripts.HASH.js` should be changed. * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Damien CORNEAU <cornead...@gmail.com> Closes #1225 from corneadoug/ZEPPELIN-1229 and squashes the following commits: ebad090 [Damien CORNEAU] Add cache buster for .js and .css file in zeppelin-web production build (cherry picked from commit 848dbd0302a4e6d4917a70c1cbc2220a7a814488) Signed-off-by: Damien CORNEAU <cornead...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/13752e20 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/13752e20 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/13752e20 Branch: refs/heads/branch-0.6 Commit: 13752e2020057da19b4c92a7bca0add38d20e0f5 Parents: aa5068f Author: Damien CORNEAU <cornead...@gmail.com> Authored: Mon Jul 25 14:20:06 2016 +0900 Committer: Damien CORNEAU <cornead...@gmail.com> Committed: Fri Jul 29 15:45:25 2016 +0900 -- zeppelin-web/Gruntfile.js | 26 +- zeppelin-web/package.json | 1 + 2 files changed, 26 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/13752e20/zeppelin-web/Gruntfile.js -- diff --git a/zeppelin-web/Gruntfile.js b/zeppelin-web/Gruntfile.js index 5574daf..8204837 100644 --- a/zeppelin-web/Gruntfile.js +++ b/zeppelin-web/Gruntfile.js @@ -56,6 +56,29 @@ module.exports = function (grunt) { } }, +htmlhint: { + options: { +'tagname-lowercase': true, +'attr-lowercase': true, +'space-tab-mixed-disabled': 'space', +'tag-pair': true, +'tag-self-close': true, +'attr-no-duplication': true + }, + src: ['src/**/*.html'] +}, + +cacheBust: { + taskName: { +options: { + baseDir: '<%= yeoman.dist %>', + assets: ['scripts/**.js', 'styles/**.css'], + deleteOriginals: true +}, +src: ['<%= yeoman.dist %>/index.html'] + } +}, + 'goog-webfont-dl': { patuaOne: { options: { @@ -500,7 +523,8 @@ module.exports = function (grunt) { 'cssmin', 'uglify', 'usemin', -'htmlmin' +'htmlmin', +'cacheBust' ]); grunt.registerTask('default', [ http://git-wip-us.apache.org/repos/asf/zeppelin/blob/13752e20/zeppelin-web/package.json -- diff --git a/zeppelin-web/package.json b/zeppelin-web/package.json index ff18967..d8081ed 100644 --- a/zeppelin-web/package.json +++ b/zeppelin-web/package.json @@ -9,6 +9,7 @@ "autoprefixer": "^6.1.0", "bower": "1.7.2", "grunt": "^0.4.1", +"grunt-cache-bust": "^1.3.0", "grunt-cli": "^0.1.13", "grunt-concurrent": "^0.5.0", "grunt-contrib-clean": "^0.5.0",
zeppelin git commit: [ZEPPELIN-1208] fixed invaild position user config button in navbar
Repository: zeppelin Updated Branches: refs/heads/master 911b4175e -> daceee568 [ZEPPELIN-1208] fixed invaild position user config button in navbar ### What is this PR for? icon for connect or disconnect invalid align in the mobile screen. See the screen shot. ### What type of PR is it? Bug Fix ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1208 ### How should this be tested? Loading a web page from a mobile or Minimizing the width web browser. ### Screenshots (if appropriate) before ![cap 2016-07-19 01-22-56-717](https://cloud.githubusercontent.com/assets/10525473/16922334/213b38ea-4d50-11e6-8b15-0564ab88c570.png) ![cap 2016-07-19 01-23-08-542](https://cloud.githubusercontent.com/assets/10525473/16922337/22449df8-4d50-11e6-9eb6-9ba24d2e712b.png) after ![cap 2016-07-19 01-21-22-964](https://cloud.githubusercontent.com/assets/10525473/16922342/25b73e5a-4d50-11e6-87b1-005f00c79a5b.png) ![cap 2016-07-19 01-21-32-983](https://cloud.githubusercontent.com/assets/10525473/16922346/274d5ca4-4d50-11e6-8aed-0e1d3c4ebb5b.png) ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: CloverHeartsAuthor: CloverHearts Closes #1202 from cloverhearts/navbar-userid-padding and squashes the following commits: 8de69bd [CloverHearts] remove empty li tag in navbar 2eca49c [CloverHearts] Merge branch 'master' into navbar-userid-padding cb055f1 [CloverHearts] fixed user config button in navbar Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/daceee56 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/daceee56 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/daceee56 Branch: refs/heads/master Commit: daceee568874a1c98c54ae487700858d2300854b Parents: 911b417 Author: CloverHearts Authored: Tue Jul 19 16:48:26 2016 +0900 Committer: Damien CORNEAU Committed: Thu Jul 21 18:36:33 2016 +0900 -- zeppelin-web/src/components/navbar/navbar.html | 14 ++ 1 file changed, 6 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/daceee56/zeppelin-web/src/components/navbar/navbar.html -- diff --git a/zeppelin-web/src/components/navbar/navbar.html b/zeppelin-web/src/components/navbar/navbar.html index ab84764..6b9e786 100644 --- a/zeppelin-web/src/components/navbar/navbar.html +++ b/zeppelin-web/src/components/navbar/navbar.html @@ -71,15 +71,13 @@ limitations under the License. - - - - - + - + + + {{ticket.principal}}
zeppelin git commit: [Zeppelin-1089] Replace JsHint with Eslint
Repository: zeppelin Updated Branches: refs/heads/master 28b478d95 -> 911b4175e [Zeppelin-1089] Replace JsHint with Eslint ### What is this PR for? This PR replace JsHint with Eslint, the original configuration was ported from jsHint using [Polyjuice](https://www.npmjs.com/package/polyjuice), then the settings were tuned to match exactly. For this PR, the goal is not to add new rules, but only to replace the system with the same rules. ### What type of PR is it? Improvement ### Todos * [x] - Remove .jshintrc ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1089 ### How should this be tested? You can simply build the code. You can try to add an unused variable in the js code to see an error. ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Damien CORNEAU <cornead...@gmail.com> Closes #1204 from corneadoug/ZEPPELIN-1089 and squashes the following commits: 6cf1e2a [Damien CORNEAU] fix $ is missing error e71389d [Damien CORNEAU] remove jshint remnants e1b389f [Damien CORNEAU] remove .jsintrc 0364ad4 [Damien CORNEAU] Fix eslint for tests 7b1da05 [Damien CORNEAU] Replace JsHint by Eslint Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/911b4175 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/911b4175 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/911b4175 Branch: refs/heads/master Commit: 911b4175e451fcbc429df91cd22c2a09f18a5952 Parents: 28b478d Author: Damien CORNEAU <cornead...@gmail.com> Authored: Wed Jul 20 15:00:12 2016 +0900 Committer: Damien CORNEAU <cornead...@gmail.com> Committed: Thu Jul 21 18:34:39 2016 +0900 -- zeppelin-web/.eslintrc | 36 +++ zeppelin-web/.jshintrc | 38 zeppelin-web/CONTRIBUTING.md| 6 ++-- zeppelin-web/Gruntfile.js | 18 -- zeppelin-web/package.json | 5 ++- zeppelin-web/pom.xml| 2 +- .../src/app/credential/credential.controller.js | 1 - .../app/interpreter/interpreter.controller.js | 1 - .../src/app/interpreter/interpreter.filter.js | 1 - .../src/app/jobmanager/jobmanager.controller.js | 1 - .../src/app/jobmanager/jobs/job.controller.js | 1 - .../src/app/notebook/notebook.controller.js | 10 +++--- .../notebook/paragraph/paragraph.controller.js | 24 + .../src/app/search/result-list.controller.js| 1 - .../src/components/saveAs/saveAs.service.js | 4 +-- zeppelin-web/src/index.html | 2 +- zeppelin-web/test/karma.conf.js | 2 +- zeppelin-web/test/spec/controllers/main.js | 3 +- zeppelin-web/test/spec/controllers/notebook.js | 3 +- zeppelin-web/test/spec/controllers/paragraph.js | 3 +- 20 files changed, 68 insertions(+), 94 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/911b4175/zeppelin-web/.eslintrc -- diff --git a/zeppelin-web/.eslintrc b/zeppelin-web/.eslintrc new file mode 100644 index 000..3113073 --- /dev/null +++ b/zeppelin-web/.eslintrc @@ -0,0 +1,36 @@ +{ + "env": { +"browser": true, +"jasmine": true, +"node": true + }, + "globals": { +"angular": false, +"_": false, +"jQuery": false, +"hljs": false, +"confirm": false, +"alert": false, +"nv": false, +"ace": false, +"d3": false, +"BootstrapDialog": false, +"Handsontable": false, +"moment": false + }, + "rules": { +"no-bitwise": 2, +"camelcase": 2, +"curly": 2, +"eqeqeq": 2, +"wrap-iife": [2, "any"], +"no-use-before-define": 0, +"new-cap": 2, +"no-caller": 2, +"quotes": [2, "single"], +"no-shadow": 0, +"no-undef": 2, +"no-unused-vars": [2, { "vars": "local", "args": "none" }], +"strict": [2, "global"] + } +} http://git-wip-us.apache.org/repos/asf/zeppelin/blob/911b4175/zeppelin-web/.jshintrc -- diff --git a/zeppelin-web/.jshintrc b/zeppelin-web/.jshintrc deleted file mode 100644 index 5cfaedd..000 --- a/zeppelin-web/.jshintrc +++ /dev/null @@ -1,38 +0,0 @@ -{ - "node": t
zeppelin git commit: [Zeppelin-1167] Group $scope.$on functions
Repository: zeppelin Updated Branches: refs/heads/master dbe5e6c12 -> 9289bb8db [Zeppelin-1167] Group $scope.$on functions ### What is this PR for? This is a small refactoring PR for zeppelin-web. This is moving all the code's `$scope.$on` functions together at the end of each controller file. ### What type of PR is it? Refactoring ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1167 ### How should this be tested? No test is needed, the code was just moved around ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Damien CORNEAU <cornead...@gmail.com> Closes #1178 from corneadoug/ZEPPELIN-1167 and squashes the following commits: a282dc5 [Damien CORNEAU] Fix indentation in result-list controller 7cd9146 [Damien CORNEAU] group .on functions at the end of the controllers Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/9289bb8d Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/9289bb8d Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/9289bb8d Branch: refs/heads/master Commit: 9289bb8dbc5d940dc0ee73d9843161c6f7d45353 Parents: dbe5e6c Author: Damien CORNEAU <cornead...@gmail.com> Authored: Wed Jul 13 16:52:01 2016 +0900 Committer: Damien CORNEAU <cornead...@gmail.com> Committed: Tue Jul 19 15:02:47 2016 +0900 -- zeppelin-web/src/app/home/home.controller.js| 38 +- .../src/app/jobmanager/jobmanager.controller.js | 58 +- .../src/app/notebook/notebook.controller.js | 258 +++ .../notebook/paragraph/paragraph.controller.js | 726 ++- .../src/app/search/result-list.controller.js| 232 +++--- .../src/components/login/login.controller.js| 11 +- .../src/components/navbar/navbar.controller.js | 28 +- .../notenameImport.controller.js| 4 + 8 files changed, 691 insertions(+), 664 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9289bb8d/zeppelin-web/src/app/home/home.controller.js -- diff --git a/zeppelin-web/src/app/home/home.controller.js b/zeppelin-web/src/app/home/home.controller.js index b733f53..1a23f9c 100644 --- a/zeppelin-web/src/app/home/home.controller.js +++ b/zeppelin-web/src/app/home/home.controller.js @@ -35,6 +35,27 @@ angular.module('zeppelinWebApp').controller('HomeCtrl', function($scope, noteboo initHome(); + $scope.reloadNotebookList = function() { +websocketMsgSrv.reloadAllNotesFromRepo(); +$scope.isReloadingNotes = true; + }; + + $scope.toggleFolderNode = function(node) { +node.hidden = !node.hidden; + }; + + angular.element('#loginModal').on('hidden.bs.modal', function(e) { +$rootScope.$broadcast('initLoginValues'); + }); + + /* + ** $scope.$on functions below + */ + + $scope.$on('setNoteMenu', function(event, notes) { +$scope.isReloadingNotes = false; + }); + $scope.$on('setNoteContent', function(event, note) { if (note) { vm.note = note; @@ -53,21 +74,4 @@ angular.module('zeppelinWebApp').controller('HomeCtrl', function($scope, noteboo } }); - $scope.$on('setNoteMenu', function(event, notes) { -$scope.isReloadingNotes = false; - }); - - $scope.reloadNotebookList = function() { -websocketMsgSrv.reloadAllNotesFromRepo(); -$scope.isReloadingNotes = true; - }; - - $scope.toggleFolderNode = function(node) { -node.hidden = !node.hidden; - }; - - angular.element('#loginModal').on('hidden.bs.modal', function(e) { -$rootScope.$broadcast('initLoginValues'); - }); - }); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9289bb8d/zeppelin-web/src/app/jobmanager/jobmanager.controller.js -- diff --git a/zeppelin-web/src/app/jobmanager/jobmanager.controller.js b/zeppelin-web/src/app/jobmanager/jobmanager.controller.js index 410f7c2..8102293 100644 --- a/zeppelin-web/src/app/jobmanager/jobmanager.controller.js +++ b/zeppelin-web/src/app/jobmanager/jobmanager.controller.js @@ -18,6 +18,37 @@ angular.module('zeppelinWebApp') .controller('JobmanagerCtrl', function($scope, websocketMsgSrv, $interval) { + $scope.filterValueToName = function(filterValue) { +var index = _.findIndex($scope.ACTIVE_INTERPRETERS, {value: filterValue}); + +if ($scope.ACTIVE_INTERPRETERS[index].name !== undefined) { + return $scope.ACTIVE_INTERPRETERS[index].name; +} else { + return 'undefined'; +} + }; + + $scope.init = function() { +$scope.jobInfomations = []; +$scope.JobInfomationsByFilter = $scope.jobInfomations; + +websocketMsgSr
zeppelin git commit: [Zeppelin-1161] Revert precise execution time
Repository: zeppelin Updated Branches: refs/heads/master e7d5d8267 -> dbe5e6c12 [Zeppelin-1161] Revert precise execution time ### What is this PR for? It had been pointed out in the mailing list that after https://github.com/apache/zeppelin/pull/862, the execution time was changed to humanized fashion, while we would want to keep something more precise in that case. This PR is rolling back to the old precise time for execution time. ### What type of PR is it? Improvement ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1161 ### How should this be tested? Run a paragraph, after it is finished, it should show: `Took x seconds.` instead of `Took a few seconds` (or Hours, Minutes, Sec) ### Screenshot ![screen shot 2016-07-13 at 2 19 45 pm](https://cloud.githubusercontent.com/assets/710411/16792626/0ff3ccb8-4905-11e6-89b6-a202944d66b8.png) ### Questions: * Does the licenses files need update? Yes * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Damien CORNEAU <cornead...@gmail.com> Closes #1172 from corneadoug/ZEPPELIN-1161 and squashes the following commits: df752bd [Damien CORNEAU] Add licence of new dependency 2c21894 [Damien CORNEAU] Fix jscs errors 9f756e3 [Damien CORNEAU] add moment plugin for duration 935f348 [Damien CORNEAU] Fix jxcs e4f7625 [Damien CORNEAU] Revert seconds ago for execution time Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/dbe5e6c1 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/dbe5e6c1 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/dbe5e6c1 Branch: refs/heads/master Commit: dbe5e6c12f327803af63e282e055af1a2e08ff02 Parents: e7d5d82 Author: Damien CORNEAU <cornead...@gmail.com> Authored: Thu Jul 14 11:29:55 2016 +0900 Committer: Damien CORNEAU <cornead...@gmail.com> Committed: Tue Jul 19 11:06:43 2016 +0900 -- zeppelin-distribution/src/bin_license/LICENSE | 2 +- zeppelin-web/bower.json | 3 ++- zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js | 3 +-- zeppelin-web/src/index.html | 1 + zeppelin-web/test/karma.conf.js | 1 + 5 files changed, 6 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/dbe5e6c1/zeppelin-distribution/src/bin_license/LICENSE -- diff --git a/zeppelin-distribution/src/bin_license/LICENSE b/zeppelin-distribution/src/bin_license/LICENSE index d7cc1cc..ba567ad 100644 --- a/zeppelin-distribution/src/bin_license/LICENSE +++ b/zeppelin-distribution/src/bin_license/LICENSE @@ -136,6 +136,7 @@ The text of each license is also included at licenses/LICENSE-[project]-[version (The MIT License) slf4j-log4j12 v1.7.10 (org.slf4j:slf4j-log4j12:jar:1.7.10 - http://www.slf4j.org) - http://www.slf4j.org/license.html (The MIT License) bcprov-jdk15on v1.51 (org.bouncycastle:bcprov-jdk15on:jar:1.51 - http://www.bouncycastle.org/java.html) - http://www.bouncycastle.org/licence.html (The MIT License) AnchorJS (https://github.com/bryanbraun/anchorjs) - https://github.com/bryanbraun/anchorjs/blob/master/README.md#license +(The MIT License) moment-duration-format v1.3.0 (https://github.com/jsmreese/moment-duration-format) - https://github.com/jsmreese/moment-duration-format/blob/master/LICENSE The following components are provided under the MIT License. @@ -145,7 +146,6 @@ The following components are provided under the MIT License. (The MIT License) angular-resource (angular-resource - https://github.com/angular/angular.js/tree/master/src/ngResource) (The MIT License) minimal-json (com.eclipsesource.minimal-json:minimal-json:0.9.4 - https://github.com/ralfstx/minimal-json) - BSD-style licenses http://git-wip-us.apache.org/repos/asf/zeppelin/blob/dbe5e6c1/zeppelin-web/bower.json -- diff --git a/zeppelin-web/bower.json b/zeppelin-web/bower.json index 94d228a..5d849b3 100644 --- a/zeppelin-web/bower.json +++ b/zeppelin-web/bower.json @@ -30,7 +30,8 @@ "ngtoast": "~2.0.0", "ng-focus-if": "~1.0.2", "bootstrap3-dialog": "bootstrap-dialog#~1.34.7", -"handsontable": "~0.24.2" +"handsontable": "~0.24.2", +"moment-duration-format": "^1.3.0" }, "devDependencies": {
zeppelin git commit: [ZEPPELIN-1183] Replace $window.location by $location
Repository: zeppelin Updated Branches: refs/heads/master 8ffd9af93 -> e7d5d8267 [ZEPPELIN-1183] Replace $window.location by $location ### What is this PR for? There is a native service used across the app to take care of re-routing to different page: `$location`, however there has been a few times where `$window.location` is used instead, and people tend to do it in new PR too. This convert the `$window.location` from the code to use `$location`. Only one was kept in `app.controller.js` for Iframe, so it doesn't flicker. ### What type of PR is it? Refactoring ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1183 ### How should this be tested? You can try to reproduce the couple of cases that redirection is needed, but overall there shouldn't be any issue from that change. ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Damien CORNEAU <cornead...@gmail.com> Closes #1188 from corneadoug/ZEPPELIN-1183 and squashes the following commits: 1bc5f3b [Damien CORNEAU] unify the paths 469f221 [Damien CORNEAU] Remove unused controller function parameters 60cd327 [Damien CORNEAU] Remove the window.location from the code, for Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/e7d5d826 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/e7d5d826 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/e7d5d826 Branch: refs/heads/master Commit: e7d5d82670a026e761c4dd70deecfae1af19b350 Parents: 8ffd9af Author: Damien CORNEAU <cornead...@gmail.com> Authored: Fri Jul 15 15:11:37 2016 +0900 Committer: Damien CORNEAU <cornead...@gmail.com> Committed: Tue Jul 19 10:54:43 2016 +0900 -- .../src/app/configuration/configuration.controller.js | 4 ++-- zeppelin-web/src/app/credential/credential.controller.js| 3 +-- zeppelin-web/src/app/home/home.controller.js| 2 +- zeppelin-web/src/app/interpreter/interpreter.controller.js | 2 +- zeppelin-web/src/app/jobmanager/jobmanager.controller.js| 3 +-- zeppelin-web/src/app/jobmanager/jobs/job.controller.js | 2 +- zeppelin-web/src/app/notebook/notebook.controller.js| 9 - .../src/app/notebook/paragraph/paragraph.controller.js | 3 +-- zeppelin-web/src/components/navbar/navbar.controller.js | 2 +- .../src/components/noteName-create/notename.controller.js | 2 +- .../components/websocketEvents/websocketEvents.factory.js | 6 +++--- 11 files changed, 17 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e7d5d826/zeppelin-web/src/app/configuration/configuration.controller.js -- diff --git a/zeppelin-web/src/app/configuration/configuration.controller.js b/zeppelin-web/src/app/configuration/configuration.controller.js index 6ac3065..8f11879 100644 --- a/zeppelin-web/src/app/configuration/configuration.controller.js +++ b/zeppelin-web/src/app/configuration/configuration.controller.js @@ -13,8 +13,8 @@ */ 'use strict'; -angular.module('zeppelinWebApp').controller('ConfigurationCtrl', function($scope, $route, $routeParams, $location, - $rootScope, $http, baseUrlSrv, ngToast) { +angular.module('zeppelinWebApp').controller('ConfigurationCtrl', function($scope, $rootScope, $http, + baseUrlSrv, ngToast) { $scope.configrations = []; $scope._ = _; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e7d5d826/zeppelin-web/src/app/credential/credential.controller.js -- diff --git a/zeppelin-web/src/app/credential/credential.controller.js b/zeppelin-web/src/app/credential/credential.controller.js index 47450a2..58c1c8b 100644 --- a/zeppelin-web/src/app/credential/credential.controller.js +++ b/zeppelin-web/src/app/credential/credential.controller.js @@ -14,8 +14,7 @@ */ 'use strict'; -angular.module('zeppelinWebApp').controller('CredentialCtrl', function($scope, $route, $routeParams, $location, - $rootScope, $http, baseUrlSrv, ngToast) { +angular.module('zeppelinWebApp').controller('CredentialCtrl', function($scope, $rootScope, $http, baseUrlSrv, ngToast) { $scope._ = _; $scope.credentialInfo = []; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e7d5d826/zeppelin-web/src/app/home/home.controller.js -- diff --git a/zeppelin-web/src/app/home/home.controller.js b/zepp
zeppelin git commit: ZEPPELIN-1170 Handsontable fails to display data on second run
Repository: zeppelin Updated Branches: refs/heads/master 74347c22f -> 8ffd9af93 ZEPPELIN-1170 Handsontable fails to display data on second run ### What is this PR for? Handsontable fails to display data on second run if first run did not render table due to an error in the query. Fix for a render issue caused by #1059 ### What type of PR is it? Bug Fix ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1170 ### How should this be tested? Please ref the screenshots ### Screenshots (if appropriate) **Before** ![old](https://cloud.githubusercontent.com/assets/2031306/16809245/35f0ced8-493d-11e6-8e1a-74c24100487a.gif) **After** ![new](https://cloud.githubusercontent.com/assets/2031306/16809256/41a4de22-493d-11e6-9a4f-31c6ae654ceb.gif) ### 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 KamathCloses #1182 from r-kamath/ZEPPELIN-1170 and squashes the following commits: 6f0f591 [Renjith Kamath] Merge remote-tracking branch 'upstream/master' into ZEPPELIN-1170 d63d517 [Renjith Kamath] ZEPPELIN-1170 Handsontable fails to display data on second run Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/8ffd9af9 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/8ffd9af9 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/8ffd9af9 Branch: refs/heads/master Commit: 8ffd9af93eeb5ceaee7f70828e2327bc6d776600 Parents: 74347c2 Author: Renjith Kamath Authored: Wed Jul 13 23:58:53 2016 +0530 Committer: Damien CORNEAU Committed: Tue Jul 19 10:43:05 2016 +0900 -- .../notebook/paragraph/paragraph.controller.js | 67 +--- 1 file changed, 29 insertions(+), 38 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/8ffd9af9/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 a968e08..abf2a3d 100644 --- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js +++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js @@ -1283,49 +1283,40 @@ angular.module('zeppelinWebApp').controller('ParagraphCtrl', function($scope, $r var resultRows = data.rows; var columnNames = _.pluck(data.columnNames, 'name'); - // on chart type change, destroy table to force reinitialization. if ($scope.hot) { $scope.hot.destroy(); -$scope.hot = null; - } - - // create table if not exists. - if (!$scope.hot) { -$scope.hot = new Handsontable(container, { - rowHeaders: false, - stretchH: 'all', - sortIndicator: true, - columnSorting: true, - contextMenu: false, - manualColumnResize: true, - manualRowResize: true, - readOnly: true, - readOnlyCellClassName: '', // don't apply any special class so we can retain current styling - fillHandle: false, - fragmentSelection: true, - disableVisualSelection: true, - cells: function(row, col, prop) { -var cellProperties = {}; -cellProperties.renderer = function(instance, td, row, col, prop, value, cellProperties) { - if (!isNaN(value)) { -cellProperties.format = '0,0.[0]'; -td.style.textAlign = 'left'; -Handsontable.renderers.NumericRenderer.apply(this, arguments); - } else if (value.length > '%html'.length && '%html ' === value.substring(0, '%html '.length)) { -td.innerHTML = value.substring('%html'.length); - } else { -Handsontable.renderers.TextRenderer.apply(this, arguments); - } -}; -return cellProperties; - } -}); } - // load data into table. - $scope.hot.updateSettings({ + $scope.hot = new Handsontable(container, { colHeaders: columnNames, -data: resultRows +data: resultRows, +rowHeaders: false, +stretchH: 'all', +sortIndicator: true, +columnSorting: true, +contextMenu: false, +manualColumnResize: true, +manualRowResize: true, +readOnly: true, +readOnlyCellClassName: '', // don't apply any special class so we can retain current styling +fillHandle: false, +fragmentSelection: true, +disableVisualSelection: true, +cells: function(row, col, prop) { +
zeppelin git commit: [ZEPPELIN-1077] remove filter query on link change
Repository: zeppelin Updated Branches: refs/heads/master c66943e44 -> 97e6293a5 [ZEPPELIN-1077] remove filter query on link change ### What is this PR for? When filtering a note-name under notebook menu through navbar, the note-name query remains as it is , when clicked on any other link. ### What type of PR is it? [Bug Fix] ### Todos ### What is the Jira issue? [[ZEPPELIN-1077]](https://issues.apache.org/jira/browse/ZEPPELIN-1077) ### How should this be tested? 1. Open the notebook menu under navbar and search for any notebook. 2. Refer to any other page like interpreter,credentials . 3. The filter query under notebook menu resets on click of any other link. ### Screenshots (if appropriate) **BEFORE:** http://g.recordit.co/4tuS8yAAPR.gif **AFTER:** http://g.recordit.co/IZUR8mBUFs.gif ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Shiv Shankar SubudhiCloses #1107 from suvam97/ZEPPELIN-1077 and squashes the following commits: 7df7b9f [Shiv Shankar Subudhi] Filter-query modified in homepage Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/97e6293a Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/97e6293a Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/97e6293a Branch: refs/heads/master Commit: 97e6293a55fbd74cfcdbfcc4b9b30447f20a0b32 Parents: c66943e Author: Shiv Shankar Subudhi Authored: Fri Jul 1 14:20:50 2016 +0530 Committer: Damien CORNEAU Committed: Wed Jul 6 13:10:53 2016 +0900 -- zeppelin-web/src/app/home/home.html | 4 ++-- .../src/components/filterNoteNames/filter-note-names.html | 2 +- zeppelin-web/src/components/navbar/navbar.controller.js | 5 + zeppelin-web/src/components/navbar/navbar.html | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/97e6293a/zeppelin-web/src/app/home/home.html -- diff --git a/zeppelin-web/src/app/home/home.html b/zeppelin-web/src/app/home/home.html index b158f63..c53813a 100644 --- a/zeppelin-web/src/app/home/home.html +++ b/zeppelin-web/src/app/home/home.html @@ -59,7 +59,7 @@ limitations under the License. Create new note - + {{noteName(note)}} @@ -67,7 +67,7 @@ limitations under the License. - + {{noteName(note)}} http://git-wip-us.apache.org/repos/asf/zeppelin/blob/97e6293a/zeppelin-web/src/components/filterNoteNames/filter-note-names.html -- diff --git a/zeppelin-web/src/components/filterNoteNames/filter-note-names.html b/zeppelin-web/src/components/filterNoteNames/filter-note-names.html index f8fd22f..e8cc2ef 100644 --- a/zeppelin-web/src/components/filterNoteNames/filter-note-names.html +++ b/zeppelin-web/src/components/filterNoteNames/filter-note-names.html @@ -11,4 +11,4 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + http://git-wip-us.apache.org/repos/asf/zeppelin/blob/97e6293a/zeppelin-web/src/components/navbar/navbar.controller.js -- diff --git a/zeppelin-web/src/components/navbar/navbar.controller.js b/zeppelin-web/src/components/navbar/navbar.controller.js index f13681e..702a257 100644 --- a/zeppelin-web/src/components/navbar/navbar.controller.js +++ b/zeppelin-web/src/components/navbar/navbar.controller.js @@ -18,6 +18,7 @@ angular.module('zeppelinWebApp') .controller('NavCtrl', function($scope, $rootScope, $http, $routeParams, $location, notebookListDataFactory, baseUrlSrv, websocketMsgSrv, arrayOrderingSrv, searchService) { + $scope.query = {q : '' }; /** Current list of notes (ids) */ $scope.showLoginWindow = function() { @@ -35,6 +36,10 @@ angular.module('zeppelinWebApp') angular.element('#notebook-list').perfectScrollbar({suppressScrollX: true}); + angular.element(document).click(function(){ +$scope.query.q = ''; + }); + $scope.$on('setNoteMenu', function(event, notes) { notebookListDataFactory.setNotes(notes); }); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/97e6293a/zeppelin-web/src/components/navbar/navbar.html
zeppelin git commit: [ZEPPELIN-1078] Does not show the text result in the paragraph sometimes.
Repository: zeppelin Updated Branches: refs/heads/master 9463fb854 -> a29fe1473 [ZEPPELIN-1078] Does not show the text result in the paragraph sometimes. ### What is this PR for? This PR fixes the problem that does not show the text result in the paragraph sometimes. ### What type of PR is it? Bug Fix ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-1078 ### How should this be tested? Try run python code constantly like screenshot. ### Screenshots (if appropriate) - before ![before](https://cloud.githubusercontent.com/assets/3348133/16436829/214a2b4e-3ddc-11e6-9af2-2ee1d7e2cf96.gif) ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: astroshimCloses #1104 from astroshim/ZEPPELIN-1078 and squashes the following commits: e0044db [astroshim] rebase 189c5eb [astroshim] remove resultRefreshed from TEXT type only ec44166 [astroshim] remove resultRefreshed from TEXT type only edf2397 [astroshim] Merge branch 'master' into ZEPPELIN-1078 441357c [astroshim] remove resultRefreshed value. Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/a29fe147 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/a29fe147 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/a29fe147 Branch: refs/heads/master Commit: a29fe14735e54d812a377b457922bd9039953da5 Parents: 9463fb8 Author: astroshim Authored: Tue Jul 5 11:26:39 2016 +0900 Committer: Damien CORNEAU Committed: Tue Jul 5 14:21:37 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/a29fe147/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 211ab59..dd0ad7d 100644 --- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js +++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js @@ -475,7 +475,7 @@ angular.module('zeppelinWebApp') $scope.renderHtml(); } else if (newType === 'ANGULAR' && resultRefreshed) { $scope.renderAngular(); - } else if (newType === 'TEXT' && resultRefreshed) { + } else if (newType === 'TEXT') { $scope.renderText(); }
zeppelin git commit: Remove Incubator and fix typos in README
Repository: zeppelin Updated Branches: refs/heads/gh-pages 2609c4801 -> a0c24b1fe Remove Incubator and fix typos in README ### What is this PR for? This PR is fixing a few typos in the README and removing incubator from the link ### What type of PR is it? Fix ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Damien CORNEAU <cornead...@gmail.com> Closes #1014 from corneadoug/fix/ghPagesReadme and squashes the following commits: c802264 [Damien CORNEAU] Remove Incubator and fix typos in README Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/a0c24b1f Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/a0c24b1f Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/a0c24b1f Branch: refs/heads/gh-pages Commit: a0c24b1fe59a26376a8b03d6ec00016e76e3baee Parents: 2609c48 Author: Damien CORNEAU <cornead...@gmail.com> Authored: Wed Jun 15 14:10:34 2016 +0900 Committer: Damien CORNEAU <cornead...@gmail.com> Committed: Thu Jun 16 15:49:26 2016 +0900 -- README.md | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a0c24b1f/README.md -- diff --git a/README.md b/README.md index 1e7a1aa..2a6c31a 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ See https://help.github.com/articles/using-jekyll-with-pages#installing-jekyll bundle exec jekyll serve --watch -## Deploy to ASF svnpubsub infra (commiters only) +## Deploy to ASF svnpubsub infra (committers only) 1. generate static website in `./_site` ``` bundle exec jekyll build --safe @@ -28,10 +28,10 @@ See https://help.github.com/articles/using-jekyll-with-pages#installing-jekyll 2. checkout ASF repo ``` -svn co https://svn.apache.org/repos/asf/incubator/zeppelin asf-zepplelin +svn co https://svn.apache.org/repos/asf/zeppelin asf-zeppelin ``` - 3. copy zeppelin/_site to asf-zepplelin/site - 4. ```svn commit``` + 3. copy `zeppelin/_site/*` to `asf-zeppelin/site` + 4. ```svn commit -m``` ## Adding a new page
zeppelin git commit: ZEPPELIN-985 ] Fixed bug in the Pyspark completion
Repository: zeppelin Updated Branches: refs/heads/master 5252ea7a7 -> dd70a5729 ZEPPELIN-985 ] Fixed bug in the Pyspark completion ### What is this PR for? Currently, does not work 'pyspark completion'. ### What type of PR is it? Bug Fix ### Todos - [x] - change standard output for completion to interpreter outer. ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-985 ### How should this be tested? Try keyword completion for pyspark interpreter. ### Screenshots (if appropriate) Before ![pycompletion_err2](https://cloud.githubusercontent.com/assets/10525473/15961476/ed5eae40-2f3f-11e6-8e22-e0df6b7012c9.gif) After ![pycompletion](https://cloud.githubusercontent.com/assets/10525473/15961433/b60d534c-2f3f-11e6-84f1-cd828f7db9e0.gif) ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: CloverHeartsCloses #988 from cloverhearts/hotfix/nwPyspark and squashes the following commits: 7c09a7a [CloverHearts] fixed pyspark completion. Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/dd70a572 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/dd70a572 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/dd70a572 Branch: refs/heads/master Commit: dd70a5729b40069972c06e49f98f39ea0fdbaf5b Parents: 5252ea7 Author: CloverHearts Authored: Fri Jun 10 18:57:16 2016 +0900 Committer: Damien CORNEAU Committed: Mon Jun 13 10:20:40 2016 +0900 -- spark/src/main/resources/python/zeppelin_pyspark.py | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/dd70a572/spark/src/main/resources/python/zeppelin_pyspark.py -- diff --git a/spark/src/main/resources/python/zeppelin_pyspark.py b/spark/src/main/resources/python/zeppelin_pyspark.py index 83ab7b3..0ea5474 100644 --- a/spark/src/main/resources/python/zeppelin_pyspark.py +++ b/spark/src/main/resources/python/zeppelin_pyspark.py @@ -118,6 +118,9 @@ class SparkVersion(object): return self.version >= self.SPARK_1_3_0 class PySparkCompletion: + def __init__(self, interpreterObject): +self.interpreterObject = interpreterObject + def getGlobalCompletion(self): objectDefList = [] try: @@ -159,9 +162,10 @@ class PySparkCompletion: for completionItem in list(objectCompletionList): completionList.add(completionItem) if len(completionList) <= 0: - print("") + self.interpreterObject.setStatementsFinished("", False) else: - print(json.dumps(list(filter(lambda x : not re.match("^__.*", x), list(completionList) + result = json.dumps(list(filter(lambda x : not re.match("^__.*", x), list(completionList + self.interpreterObject.setStatementsFinished(result, False) output = Logger() @@ -205,7 +209,7 @@ sc = SparkContext(jsc=jsc, gateway=gateway, conf=conf) sqlc = SQLContext(sc, intp.getSQLContext()) sqlContext = sqlc -completion = PySparkCompletion() +completion = PySparkCompletion(intp) z = PyZeppelinContext(intp.getZeppelinContext()) while True :
svn commit: r1745413 - in /incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT: ./ assets/themes/zeppelin/js/ development/ displaysystem/ install/ interpreter/ manual/ rest-api/ security/ storage/
Author: corneadoug Date: Wed May 25 00:14:15 2016 New Revision: 1745413 URL: http://svn.apache.org/viewvc?rev=1745413=rev Log: Edit image links Modified: incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/assets/themes/zeppelin/js/docs.js incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/atom.xml incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/development/howtocontribute.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/development/howtocontributewebsite.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/development/writingzeppelininterpreter.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/displaysystem/back-end-angular.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/displaysystem/display.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/displaysystem/front-end-angular.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/displaysystem/table.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/index.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/install/install.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/install/upgrade.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/install/virtual_machine.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/install/yarn_install.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/interpreter/alluxio.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/interpreter/cassandra.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/interpreter/elasticsearch.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/interpreter/flink.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/interpreter/geode.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/interpreter/hbase.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/interpreter/hdfs.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/interpreter/hive.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/interpreter/ignite.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/interpreter/jdbc.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/interpreter/lens.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/interpreter/markdown.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/interpreter/postgresql.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/interpreter/r.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/interpreter/scalding.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/interpreter/spark.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/manual/dependencymanagement.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/manual/dynamicform.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/manual/dynamicinterpreterload.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/manual/interpreters.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/manual/notebookashomepage.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/manual/publish.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/manual/shiroauthentication.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/pleasecontribute.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rest-api/rest-configuration.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rest-api/rest-interpreter.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rest-api/rest-notebook.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/rss.xml incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/screenshots.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/security/interpreter_authorization.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/security/notebook_authorization.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/security/overview.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/sitemap.txt incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/storage/storage.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/tutorial/tutorial.html incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/ui_layout/zeppelin_layout.html Modified: incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/assets/themes/zeppelin/js/docs.js URL: http://svn.apache.org/viewvc/incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/assets/themes/zeppelin/js/docs.js?rev=1745413=1745412=1745413=diff == --- incubator/zeppelin/site/docs/0.6.0-incubating-SNAPSHOT/assets/themes/zeppelin/js/docs.js (original) +++ incubator
incubator-zeppelin git commit: Fix a few image not rendering
Repository: incubator-zeppelin Updated Branches: refs/heads/master 19889c361 -> 2c1693ea4 Fix a few image not rendering ### What is this PR for? There was a recent PR made by doanduyhai that was changing some images URL to include `../assets`. However, I found a few more cases in the deployed website. It is actually a bit hard to understand why this happens in some cases only, maybe it could be better to replace all `/assets` to `../assets`, however this PR is only fixing the current issues. ### What type of PR is it? Bug Fix ### How should this be tested? You can build the doc and run it locally ### Screenshots (if appropriate) https://cloud.githubusercontent.com/assets/710411/15376817/45648b78-1d0c-11e6-82cb-4ba106e01043.png;> https://cloud.githubusercontent.com/assets/710411/15376819/493ff976-1d0c-11e6-9960-cbd568f5d0ec.png;> ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Damien CORNEAU <cornead...@gmail.com> Closes #899 from corneadoug/fix/docsImagesLink and squashes the following commits: c7333d7 [Damien CORNEAU] Fix a few image not rendering Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/2c1693ea Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/2c1693ea Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/2c1693ea Branch: refs/heads/master Commit: 2c1693ea4e8f150f2ac3d044d34e326a3942abe1 Parents: 19889c3 Author: Damien CORNEAU <cornead...@gmail.com> Authored: Wed May 18 15:19:12 2016 -0700 Committer: Damien CORNEAU <cornead...@gmail.com> Committed: Tue May 24 17:06:25 2016 -0700 -- docs/assets/themes/zeppelin/js/docs.js | 6 ++-- docs/manual/interpreters.md| 10 +++--- docs/ui_layout/zeppelin_layout.md | 55 ++--- 3 files changed, 33 insertions(+), 38 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/2c1693ea/docs/assets/themes/zeppelin/js/docs.js -- diff --git a/docs/assets/themes/zeppelin/js/docs.js b/docs/assets/themes/zeppelin/js/docs.js index 3fc9bf2..d687727 100644 --- a/docs/assets/themes/zeppelin/js/docs.js +++ b/docs/assets/themes/zeppelin/js/docs.js @@ -99,9 +99,7 @@ function viewSolution() { // A script to fix internal hash links because we have an overlapping top bar. // Based on https://github.com/twitter/bootstrap/issues/193#issuecomment-2281510 function maybeScrollToHash() { - console.log("HERE"); if (window.location.hash && $(window.location.hash).length) { -console.log("HERE2", $(window.location.hash), $(window.location.hash).offset().top); var newTop = $(window.location.hash).offset().top - 57; $(window).scrollTop(newTop); } @@ -117,5 +115,5 @@ $(function() { // Scroll now too in case we had opened the page on a hash, but wait a bit because some browsers // will try to do *their* initial scroll after running the onReady handler. - $(window).load(function() { setTimeout(function() { maybeScrollToHash(); }, 25); }); -}); \ No newline at end of file + $(window).load(function() { setTimeout(function() { maybeScrollToHash(); }, 25); }); +}); http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/2c1693ea/docs/manual/interpreters.md -- diff --git a/docs/manual/interpreters.md b/docs/manual/interpreters.md index 0441679..87a4122 100644 --- a/docs/manual/interpreters.md +++ b/docs/manual/interpreters.md @@ -29,18 +29,18 @@ Zeppelin Interpreter is a plug-in which enables Zeppelin users to use a specific When you click the ```+Create``` button in the interpreter page, the interpreter drop-down list box will show all the available interpreters on your server. - + ## What is Zeppelin Interpreter Setting? Zeppelin interpreter setting is the configuration of a given interpreter on Zeppelin server. For example, the properties are required for hive JDBC interpreter to connect to the Hive server. - + Properties are exported as environment variable when property name is consisted of upper characters, numbers and underscore ([A-Z_0-9]). Otherwise set properties as JVM property. Each notebook can be bound to multiple Interpreter Settings using setting icon on upper right corner of the notebook. - + @@ -51,7 +51,7 @@ By default, every interpreter is belonged to a single group, but the group might Technically, Zeppelin interpreters from the same group are running in the same JVM. For more information about this, please checkout [here](../development/writingzepp