From 967b2fa5e78dabca1a09bdc332540705842f8715 Mon Sep 17 00:00:00 2001 From: AhyoungRyu Date: Sun, 5 Jun 2016 19:43:36 -0700 Subject: [PATCH 1/3] ZEPPELIN-959: Fix odd code blocks in some documentations --- docs/development/writingzeppelininterpreter.md | 4 ++++ docs/storage/storage.md | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/development/writingzeppelininterpreter.md b/docs/development/writingzeppelininterpreter.md index 04b2bb9e9e8..a024fcaeddf 100644 --- a/docs/development/writingzeppelininterpreter.md +++ b/docs/development/writingzeppelininterpreter.md @@ -39,11 +39,13 @@ Creating a new interpreter is quite simple. Just extend [org.apache.zeppelin.int You can include `org.apache.zeppelin:zeppelin-interpreter:[VERSION]` artifact in your build system. And you should your jars under your interpreter directory with specific directory name. Zeppelin server reads interpreter directories recursively and initializes interpreters including your own interpreter. There are three locations where you can store your interpreter group, name and other information. Zeppelin server tries to find the location below. Next, Zeppelin tries to find `interpareter-setting.json` in your interpreter jar. + ``` {ZEPPELIN_INTERPRETER_DIR}/{YOUR_OWN_INTERPRETER_DIR}/interpreter-setting.json ``` Here is an example of `interpareter-setting.json` on your own interpreter. + ```json [ { @@ -72,11 +74,13 @@ Here is an example of `interpareter-setting.json` on your own interpreter. ``` Finally, Zeppelin uses static initialization with the following: + ``` static { Interpreter.register("MyInterpreterName", MyClassName.class.getName()); } ``` + **Static initialization is deprecated and will be supported until 0.6.0.** The name will appear later in the interpreter name option box during the interpreter configuration process. diff --git a/docs/storage/storage.md b/docs/storage/storage.md index 25c62bb429b..f52ae72fe98 100644 --- a/docs/storage/storage.md +++ b/docs/storage/storage.md @@ -114,6 +114,7 @@ export ZEPPELIN_NOTEBOOK_S3_KMS_KEY_ID = kms-key-id ``` Or using the following setting in **zeppelin-site.xml**: + ``` zeppelin.notebook.s3.kmsKeyID @@ -132,6 +133,7 @@ export ZEPPELIN_NOTEBOOK_S3_EMP = class-name ``` Or using the following setting in **zeppelin-site.xml**: + ``` zeppelin.notebook.s3.encryptionMaterialsProvider @@ -144,7 +146,6 @@ Or using the following setting in **zeppelin-site.xml**: Using `AzureNotebookRepo` you can connect your Zeppelin with your Azure account for notebook storage. -
First of all, input your `AccountName`, `AccountKey`, and `Share Name` in the file **zeppelin-site.xml** by commenting out and completing the next properties: From 879b8f9a37aca0e0bf56af9f117da7fdec9e4800 Mon Sep 17 00:00:00 2001 From: AhyoungRyu Date: Sun, 5 Jun 2016 22:26:09 -0700 Subject: [PATCH 2/3] Revert "ZEPPELIN-959: Fix odd code blocks in some documentations" This reverts commit 967b2fa5e78dabca1a09bdc332540705842f8715. --- docs/development/writingzeppelininterpreter.md | 4 ---- docs/storage/storage.md | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/docs/development/writingzeppelininterpreter.md b/docs/development/writingzeppelininterpreter.md index a024fcaeddf..04b2bb9e9e8 100644 --- a/docs/development/writingzeppelininterpreter.md +++ b/docs/development/writingzeppelininterpreter.md @@ -39,13 +39,11 @@ Creating a new interpreter is quite simple. Just extend [org.apache.zeppelin.int You can include `org.apache.zeppelin:zeppelin-interpreter:[VERSION]` artifact in your build system. And you should your jars under your interpreter directory with specific directory name. Zeppelin server reads interpreter directories recursively and initializes interpreters including your own interpreter. There are three locations where you can store your interpreter group, name and other information. Zeppelin server tries to find the location below. Next, Zeppelin tries to find `interpareter-setting.json` in your interpreter jar. - ``` {ZEPPELIN_INTERPRETER_DIR}/{YOUR_OWN_INTERPRETER_DIR}/interpreter-setting.json ``` Here is an example of `interpareter-setting.json` on your own interpreter. - ```json [ { @@ -74,13 +72,11 @@ Here is an example of `interpareter-setting.json` on your own interpreter. ``` Finally, Zeppelin uses static initialization with the following: - ``` static { Interpreter.register("MyInterpreterName", MyClassName.class.getName()); } ``` - **Static initialization is deprecated and will be supported until 0.6.0.** The name will appear later in the interpreter name option box during the interpreter configuration process. diff --git a/docs/storage/storage.md b/docs/storage/storage.md index f52ae72fe98..25c62bb429b 100644 --- a/docs/storage/storage.md +++ b/docs/storage/storage.md @@ -114,7 +114,6 @@ export ZEPPELIN_NOTEBOOK_S3_KMS_KEY_ID = kms-key-id ``` Or using the following setting in **zeppelin-site.xml**: - ``` zeppelin.notebook.s3.kmsKeyID @@ -133,7 +132,6 @@ export ZEPPELIN_NOTEBOOK_S3_EMP = class-name ``` Or using the following setting in **zeppelin-site.xml**: - ``` zeppelin.notebook.s3.encryptionMaterialsProvider @@ -146,6 +144,7 @@ Or using the following setting in **zeppelin-site.xml**: Using `AzureNotebookRepo` you can connect your Zeppelin with your Azure account for notebook storage. +
First of all, input your `AccountName`, `AccountKey`, and `Share Name` in the file **zeppelin-site.xml** by commenting out and completing the next properties: From 8f8cc70553ece26e9c09f6b743db6a07821158e4 Mon Sep 17 00:00:00 2001 From: AhyoungRyu Date: Sun, 5 Jun 2016 22:30:20 -0700 Subject: [PATCH 3/3] ZEPPELIN-959: Fix odd code block in writingzeppelininterpreter.md --- docs/development/writingzeppelininterpreter.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/development/writingzeppelininterpreter.md b/docs/development/writingzeppelininterpreter.md index 04b2bb9e9e8..a024fcaeddf 100644 --- a/docs/development/writingzeppelininterpreter.md +++ b/docs/development/writingzeppelininterpreter.md @@ -39,11 +39,13 @@ Creating a new interpreter is quite simple. Just extend [org.apache.zeppelin.int You can include `org.apache.zeppelin:zeppelin-interpreter:[VERSION]` artifact in your build system. And you should your jars under your interpreter directory with specific directory name. Zeppelin server reads interpreter directories recursively and initializes interpreters including your own interpreter. There are three locations where you can store your interpreter group, name and other information. Zeppelin server tries to find the location below. Next, Zeppelin tries to find `interpareter-setting.json` in your interpreter jar. + ``` {ZEPPELIN_INTERPRETER_DIR}/{YOUR_OWN_INTERPRETER_DIR}/interpreter-setting.json ``` Here is an example of `interpareter-setting.json` on your own interpreter. + ```json [ { @@ -72,11 +74,13 @@ Here is an example of `interpareter-setting.json` on your own interpreter. ``` Finally, Zeppelin uses static initialization with the following: + ``` static { Interpreter.register("MyInterpreterName", MyClassName.class.getName()); } ``` + **Static initialization is deprecated and will be supported until 0.6.0.** The name will appear later in the interpreter name option box during the interpreter configuration process.