You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by sm...@apache.org on 2014/10/15 03:06:51 UTC
git commit: SLIDER-519. Cleanup slider-client.xml for the slider
package
Repository: incubator-slider
Updated Branches:
refs/heads/develop 4febd7737 -> c31daa162
SLIDER-519. Cleanup slider-client.xml for the slider package
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/c31daa16
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/c31daa16
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/c31daa16
Branch: refs/heads/develop
Commit: c31daa16225f9e2f3f83c882f5f686662544fd92
Parents: 4febd77
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Tue Oct 14 18:06:43 2014 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Tue Oct 14 18:06:43 2014 -0700
----------------------------------------------------------------------
slider-assembly/src/conf-hdp/slider-client.xml | 11 -----------
slider-assembly/src/conf/slider-client.xml | 10 +---------
2 files changed, 1 insertion(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c31daa16/slider-assembly/src/conf-hdp/slider-client.xml
----------------------------------------------------------------------
diff --git a/slider-assembly/src/conf-hdp/slider-client.xml b/slider-assembly/src/conf-hdp/slider-client.xml
index 8e87e53..a2cc385 100644
--- a/slider-assembly/src/conf-hdp/slider-client.xml
+++ b/slider-assembly/src/conf-hdp/slider-client.xml
@@ -27,17 +27,6 @@
<value>localhost:2181</value>
</property>
- <property>
- <name>slider.yarn.queue</name>
- <value>default</value>
- <description>YARN queue for the Application Master</description>
- </property>
-
- <property>
- <name>yarn.log-aggregation-enable</name>
- <value>true</value>
- </property>
-
<!--
<property>
<name>yarn.application.classpath</name>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c31daa16/slider-assembly/src/conf/slider-client.xml
----------------------------------------------------------------------
diff --git a/slider-assembly/src/conf/slider-client.xml b/slider-assembly/src/conf/slider-client.xml
index abf07fe..b6a5b32 100644
--- a/slider-assembly/src/conf/slider-client.xml
+++ b/slider-assembly/src/conf/slider-client.xml
@@ -27,12 +27,7 @@
<value>@ZK-QUORUM</value>
</property>
- <property>
- <name>slider.yarn.queue</name>
- <value>default</value>
- <description>YARN queue for the Application Master</description>
- </property>
-
+<!--
<property>
<name>slider.client.resource.origin</name>
<value>conf/slider-client.xml</value>
@@ -44,7 +39,6 @@
<value>true</value>
</property>
-<!--
<property>
<name>yarn.application.classpath</name>
<value>/etc/hadoop/conf,/usr/lib/hadoop/*,/usr/lib/hadoop/lib/*,/usr/lib/hadoop-hdfs/*,/usr/lib/hadoop-hdfs/lib/*,/usr/lib/hadoop-yarn/*,/usr/lib/hadoop-yarn/lib/*,/usr/lib/hadoop-mapreduce/*,/usr/lib/hadoop-mapreduce/lib/*</value>
@@ -64,9 +58,7 @@
<name>fs.defaultFS</name>
<value>@FILESYSTEM</value>
</property>
--->
-<!--
<property>
<name>yarn.resourcemanager.principal</name>
<value>yarn/master@MINICLUSTER</value>