AMBARI-19577. Add Livy session recovery configurations in Ambari - fix merge issue (Saisai Shao via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b00cf74f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b00cf74f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b00cf74f Branch: refs/heads/branch-feature-AMBARI-12556 Commit: b00cf74f6cecb984381eeed9e464ad1db6461a18 Parents: e7d0e78 Author: Sumit Mohanty <[email protected]> Authored: Fri Feb 10 16:53:45 2017 -0800 Committer: Sumit Mohanty <[email protected]> Committed: Fri Feb 10 16:53:45 2017 -0800 ---------------------------------------------------------------------- .../stacks/HDP/2.6/services/SPARK2/configuration/livy2-conf.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b00cf74f/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/livy2-conf.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/livy2-conf.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/livy2-conf.xml index c8a65bd..c21a5e6 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/livy2-conf.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/livy2-conf.xml @@ -85,8 +85,8 @@ Whether to enable HiveContext in livy interpreter </description> <on-ambari-upgrade add="false"/> - <property> </property> + <property> <name>livy.server.recovery.mode</name> <value>recovery</value> <description>
