Repository: zeppelin Updated Branches: refs/heads/branch-0.8 6a39c8d6e -> 8219a3730
[ZEPPELIN-3187] Remove doubles of settings in zeppelin-site.xml.template ### What is this PR for? Remove doubles in zeppelin-site.xml.template ### What type of PR is it? [Bug Fix ] ### What is the Jira issue? * [ZEPPELIN-3187] ### How should this be tested? * No need ### 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: mebelousov <mebelou...@ya.ru> Closes #2741 from mebelousov/ZEPPELIN-3187 and squashes the following commits: 44d6d08 [mebelousov] Remove doubles of settings (cherry picked from commit 08251226203107303785ffde458b074d47b13a6f) Signed-off-by: Jeff Zhang <zjf...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/8219a373 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/8219a373 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/8219a373 Branch: refs/heads/branch-0.8 Commit: 8219a37302aa81487d3ddfa6f10699e0a1657e4b Parents: 6a39c8d Author: mebelousov <mebelou...@ya.ru> Authored: Tue Jan 23 15:39:00 2018 +0300 Committer: Jeff Zhang <zjf...@apache.org> Committed: Mon Jan 29 14:10:55 2018 +0800 ---------------------------------------------------------------------- conf/zeppelin-site.xml.template | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/8219a373/conf/zeppelin-site.xml.template ---------------------------------------------------------------------- diff --git a/conf/zeppelin-site.xml.template b/conf/zeppelin-site.xml.template index d566a71..33aa8ac 100755 --- a/conf/zeppelin-site.xml.template +++ b/conf/zeppelin-site.xml.template @@ -427,13 +427,13 @@ <property> <name>zeppelin.interpreter.lifecyclemanager.timeout.checkinterval</name> <value>60000</value> - <description>milliseconds of the interval to checking whether interpreter is time out</description> + <description>Milliseconds of the interval to checking whether interpreter is time out</description> </property> <property> <name>zeppelin.interpreter.lifecyclemanager.timeout.threshold</name> <value>3600000</value> - <description>milliseconds of the interpreter timeout threshold, by default it is 1 hour</description> + <description>Milliseconds of the interpreter timeout threshold, by default it is 1 hour</description> </property> <!-- @@ -468,12 +468,14 @@ </property> --> <!-- + <property> <name>zeppelin.server.xxss.protection</name> <value>1</value> <description>The HTTP X-XSS-Protection response header is a feature of Internet Explorer, Chrome and Safari that stops pages from loading when they detect reflected cross-site scripting (XSS) attacks. When value is set to 1 and a cross-site scripting attack is detected, the browser will sanitize the page (remove the unsafe parts).</description> </property> --> + <!-- <property> <name>zeppelin.interpreter.callback.portRange</name> @@ -483,29 +485,6 @@ <!-- <property> - <name>zeppelin.interpreter.lifecyclemanager.class</name> - <value>org.apache.zeppelin.interpreter.lifecycle.TimeoutLifecycleManager</value> -</property> ---> - -<!-- -<property> - <name>zeppelin.interpreter.lifecyclemanager.timeout.checkinterval</name> - <value>6000</value> - <description>Check interval of interpreter expiration in seconds</description> -</property> ---> - -<!-- -<property> - <name>zeppelin.interpreter.lifecyclemanager.timeout.threshold</name> - <value>3600000</value> - <description>Threshold of interpreter idle time in seconds, interpeter exceed this threshold will be killed</description> -</property> ---> - -<!-- -<property> <name>zeppelin.recovery.storage.class</name> <value>org.apache.zeppelin.interpreter.recovery.FileSystemRecoveryStorage</value> <description>ReoveryStorage implementation</description>
