Repository: zeppelin Updated Branches: refs/heads/master 7015a7cc9 -> 5252ea7a7
[ZEPPELIN-980] missing "incubation-" references ### What is this PR for? This is extension to https://github.com/apache/zeppelin/pull/983, with missing references of incubation. ### What type of PR is it? [Improvement] ### What is the Jira issue? [ZEPPELIN-980](https://issues.apache.org/jira/browse/ZEPPELIN-980) ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Prabhjyot Singh <[email protected]> Closes #992 from prabhjyotsingh/ZEPPELIN-980 and squashes the following commits: 5fa97b7 [Prabhjyot Singh] missing "incubation-" references Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/5252ea7a Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/5252ea7a Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/5252ea7a Branch: refs/heads/master Commit: 5252ea7a74330ebd0fa2e3775d1f7c4ab5b3467e Parents: 7015a7c Author: Prabhjyot Singh <[email protected]> Authored: Fri Jun 10 22:49:32 2016 +0530 Committer: Mina Lee <[email protected]> Committed: Sun Jun 12 12:47:35 2016 -0700 ---------------------------------------------------------------------- docs/install/virtual_machine.md | 6 +++--- docs/security/notebook_authorization.md | 4 ++-- scripts/vagrant/zeppelin-dev/.gitignore | 2 +- scripts/vagrant/zeppelin-dev/README.md | 6 +++--- scripts/vagrant/zeppelin-dev/show-instructions.sh | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/5252ea7a/docs/install/virtual_machine.md ---------------------------------------------------------------------- diff --git a/docs/install/virtual_machine.md b/docs/install/virtual_machine.md index 7e454fa..12f1ce4 100644 --- a/docs/install/virtual_machine.md +++ b/docs/install/virtual_machine.md @@ -62,7 +62,7 @@ curl -fsSL https://raw.githubusercontent.com/NFLabs/z-manager/master/zeppelin-in ### Building Zeppelin -You can now `git clone git://git.apache.org/incubator-zeppelin.git` into a directory on your host machine, or directly in your virtual machine. +You can now `git clone git://git.apache.org/zeppelin.git` into a directory on your host machine, or directly in your virtual machine. Cloning Zeppelin into the `/scripts/vagrant/zeppelin-dev` directory from the host, will allow the directory to be shared between your host and the guest machine. @@ -71,7 +71,7 @@ Cloning the project again may seem counter intuitive, since this script likley o Synced folders enable Vagrant to sync a folder on the host machine to the guest machine, allowing you to continue working on your project's files on your host machine, but use the resources in the guest machine to compile or run your project. _[(1) Synced Folder Description from Vagrant Up](https://docs.vagrantup.com/v2/synced-folders/index.html)_ By default, Vagrant will share your project directory (the directory with the Vagrantfile) to `/vagrant`. Which means you should be able to build within the guest machine after you -`cd /vagrant/incubator-zeppelin` +`cd /vagrant/zeppelin` ### What's in this VM? @@ -101,7 +101,7 @@ The virtual machine consists of: This assumes you've already cloned the project either on the host machine in the zeppelin-dev directory (to be shared with the guest machine) or cloned directly into a directory while running inside the guest machine. The following build steps will also include Python and R support via PySpark and SparkR: ``` -cd /incubator-zeppelin +cd /zeppelin mvn clean package -Pspark-1.6 -Ppyspark -Phadoop-2.4 -Psparkr -DskipTests ./bin/zeppelin-daemon.sh start ``` http://git-wip-us.apache.org/repos/asf/zeppelin/blob/5252ea7a/docs/security/notebook_authorization.md ---------------------------------------------------------------------- diff --git a/docs/security/notebook_authorization.md b/docs/security/notebook_authorization.md index 34888ea..7793d4f 100644 --- a/docs/security/notebook_authorization.md +++ b/docs/security/notebook_authorization.md @@ -45,11 +45,11 @@ If someone who doesn't have **read** permission is trying to access the notebook In this section, we will explain the detail about how the notebook authorization works in backend side. #### NotebookServer -The [NotebookServer](https://github.com/apache/incubator-zeppelin/blob/master/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java) classifies every notebook operations into three categories: **Read**, **Write**, **Manage**. +The [NotebookServer](https://github.com/apache/zeppelin/blob/master/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java) classifies every notebook operations into three categories: **Read**, **Write**, **Manage**. Before executing a notebook operation, it checks if the user and the groups associated with the `NotebookSocket` have permissions. For example, before executing a **Read** operation, it checks if the user and the groups have at least one entity that belongs to the **Reader** entities. #### Notebook REST API call -Zeppelin executes a [REST API call](https://github.com/apache/incubator-zeppelin/blob/master/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java) for the notebook permission information. +Zeppelin executes a [REST API call](https://github.com/apache/zeppelin/blob/master/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java) for the notebook permission information. In the backend side, Zeppelin gets the user information for the connection and allows the operation if the users and groups associated with the current user have at least one entity that belongs to owner entities for the notebook. http://git-wip-us.apache.org/repos/asf/zeppelin/blob/5252ea7a/scripts/vagrant/zeppelin-dev/.gitignore ---------------------------------------------------------------------- diff --git a/scripts/vagrant/zeppelin-dev/.gitignore b/scripts/vagrant/zeppelin-dev/.gitignore index c5ab41f..e4b9813 100644 --- a/scripts/vagrant/zeppelin-dev/.gitignore +++ b/scripts/vagrant/zeppelin-dev/.gitignore @@ -1,4 +1,4 @@ .vagrant .DS_Store -incubator-zeppelin +zeppelin http://git-wip-us.apache.org/repos/asf/zeppelin/blob/5252ea7a/scripts/vagrant/zeppelin-dev/README.md ---------------------------------------------------------------------- diff --git a/scripts/vagrant/zeppelin-dev/README.md b/scripts/vagrant/zeppelin-dev/README.md index 60e9708..9e5c9c9 100644 --- a/scripts/vagrant/zeppelin-dev/README.md +++ b/scripts/vagrant/zeppelin-dev/README.md @@ -47,7 +47,7 @@ curl -fsSL https://raw.githubusercontent.com/NFLabs/z-manager/master/zeppelin-in ### Building Zeppelin -You can now `git clone git://git.apache.org/incubator-zeppelin.git` into a directory on your host machine, or directly in your virtual machine. +You can now `git clone git://git.apache.org/zeppelin.git` into a directory on your host machine, or directly in your virtual machine. Cloning zeppelin into the `/scripts/vagrant/zeppelin-dev` directory from the host, will allow the directory to be shared between your host and the guest machine. @@ -56,7 +56,7 @@ Cloning the project again may seem counter intuitive, since this script likley o Synced folders enable Vagrant to sync a folder on the host machine to the guest machine, allowing you to continue working on your project's files on your host machine, but use the resources in the guest machine to compile or run your project. _[(1) Synced Folder Description from Vagrant Up](https://docs.vagrantup.com/v2/synced-folders/index.html)_ By default, Vagrant will share your project directory (the directory with the Vagrantfile) to `/vagrant`. Which means you should be able to build within the guest machine after you -`cd /vagrant/incubator-zeppelin` +`cd /vagrant/zeppelin` ### What's in this VM? @@ -86,7 +86,7 @@ The virtual machine consists of: This assumes you've already cloned the project either on the host machine in the zeppelin-dev directory (to be shared with the guest machine) or cloned directly into a directory while running inside the guest machine. The following build steps will also include Python and R support via PySpark and SparkR: ``` -cd /incubator-zeppelin +cd /zeppelin mvn clean package -Pspark-1.6 -Ppyspark -Phadoop-2.4 -Psparkr -DskipTests ./bin/zeppelin-daemon.sh start ``` http://git-wip-us.apache.org/repos/asf/zeppelin/blob/5252ea7a/scripts/vagrant/zeppelin-dev/show-instructions.sh ---------------------------------------------------------------------- diff --git a/scripts/vagrant/zeppelin-dev/show-instructions.sh b/scripts/vagrant/zeppelin-dev/show-instructions.sh index 16a399d..f3b2b27 100644 --- a/scripts/vagrant/zeppelin-dev/show-instructions.sh +++ b/scripts/vagrant/zeppelin-dev/show-instructions.sh @@ -16,9 +16,9 @@ echo '# Post vagrant up instructions.' echo '# From your host machine,' -echo '# git clone the incubator-zeppelin branch into this directory' +echo '# git clone the zeppelin branch into this directory' echo -echo 'git clone git://git.apache.org/incubator-zeppelin.git' +echo 'git clone git://git.apache.org/zeppelin.git' echo echo '# Cloning the project again may seem counter intuitive, since this script' echo '# originated from the project repository. Consider copying just the vagrant/zeppelin-dev' @@ -29,7 +29,7 @@ echo 'vagrant ssh' echo echo '# then when running inside the VM' echo -echo 'cd /vagrant/incubator-zeppelin' +echo 'cd /vagrant/zeppelin' echo 'mvn clean package -DskipTests' echo echo '# or for a specific Spark/Hadoop build with additional options such as python and R support'
