ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From avija...@apache.org
Subject ambari git commit: AMBARI-17999 Typo in property name yarn.nodemanager.log.retain-second, should be seconds. (Ying Zhang via avijayan)
Date Tue, 13 Dec 2016 21:23:45 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 66b1f3814 -> fb86ef739


AMBARI-17999 Typo in property name yarn.nodemanager.log.retain-second, should be seconds. (Ying Zhang via avijayan)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fb86ef73
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fb86ef73
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fb86ef73

Branch: refs/heads/branch-2.5
Commit: fb86ef73906f33ffc1d488b97eff127409c256c3
Parents: 66b1f38
Author: Aravindan Vijayan <avijayan@hortonworks.com>
Authored: Tue Dec 13 13:23:30 2016 -0800
Committer: Aravindan Vijayan <avijayan@hortonworks.com>
Committed: Tue Dec 13 13:23:30 2016 -0800

----------------------------------------------------------------------
 .../common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml   | 2 +-
 .../stacks/BIGTOP/0.8/services/YARN/configuration/yarn-site.xml  | 2 +-
 .../2.0.6.GlusterFS/services/YARN/configuration/yarn-site.xml    | 2 +-
 .../HDP/2.1.GlusterFS/services/YARN/configuration/yarn-site.xml  | 2 +-
 .../resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json     | 2 +-
 .../src/test/python/stacks/2.0.6/configs/altfs_plus_hdfs.json    | 2 +-
 .../src/test/python/stacks/2.0.6/configs/client-upgrade.json     | 2 +-
 .../src/test/python/stacks/2.0.6/configs/default.hbasedecom.json | 2 +-
 ambari-server/src/test/python/stacks/2.0.6/configs/default.json  | 2 +-
 .../python/stacks/2.0.6/configs/default.non_gmetad_host.json     | 2 +-
 .../test/python/stacks/2.0.6/configs/default_ams_embedded.json   | 2 +-
 .../src/test/python/stacks/2.0.6/configs/default_client.json     | 2 +-
 .../test/python/stacks/2.0.6/configs/default_hive_non_hdfs.json  | 2 +-
 .../src/test/python/stacks/2.0.6/configs/default_no_install.json | 2 +-
 .../test/python/stacks/2.0.6/configs/default_oozie_mysql.json    | 2 +-
 .../stacks/2.0.6/configs/default_update_exclude_file_only.json   | 2 +-
 .../test/python/stacks/2.0.6/configs/default_with_bucket.json    | 2 +-
 ambari-server/src/test/python/stacks/2.0.6/configs/flume_22.json | 2 +-
 .../src/test/python/stacks/2.0.6/configs/flume_target.json       | 2 +-
 .../python/stacks/2.0.6/configs/ha_bootstrap_active_node.json    | 2 +-
 .../python/stacks/2.0.6/configs/ha_bootstrap_standby_node.json   | 2 +-
 .../2.0.6/configs/ha_bootstrap_standby_node_initial_start.json   | 2 +-
 ...ha_bootstrap_standby_node_initial_start_dfs_nameservices.json | 2 +-
 .../src/test/python/stacks/2.0.6/configs/ha_default.json         | 2 +-
 .../src/test/python/stacks/2.0.6/configs/ha_secured.json         | 2 +-
 .../src/test/python/stacks/2.0.6/configs/hbase-2.2.json          | 2 +-
 .../src/test/python/stacks/2.0.6/configs/hbase-check-2.2.json    | 2 +-
 .../test/python/stacks/2.0.6/configs/hbase-rs-2.2-phoenix.json   | 2 +-
 .../src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json       | 2 +-
 .../test/python/stacks/2.0.6/configs/oozie_existing_sqla.json    | 2 +-
 .../test/python/stacks/2.0.6/configs/rebalancehdfs_default.json  | 2 +-
 .../test/python/stacks/2.0.6/configs/rebalancehdfs_secured.json  | 2 +-
 ambari-server/src/test/python/stacks/2.0.6/configs/secured.json  | 2 +-
 .../src/test/python/stacks/2.0.6/configs/secured_client.json     | 2 +-
 .../test/python/stacks/2.0.6/configs/secured_no_jce_name.json    | 2 +-
 .../src/test/python/stacks/2.1/configs/client-upgrade.json       | 2 +-
 ambari-server/src/test/python/stacks/2.1/configs/default.json    | 2 +-
 ambari-server/src/test/python/stacks/2.1/configs/secured.json    | 2 +-
 .../stacks/2.2/configs/journalnode-upgrade-hdfs-secure.json      | 2 +-
 .../src/test/python/stacks/2.2/configs/journalnode-upgrade.json  | 2 +-
 .../test/python/stacks/2.2/configs/pig-service-check-secure.json | 2 +-
 .../src/test/python/stacks/2.2/configs/ranger-admin-upgrade.json | 2 +-
 .../test/python/stacks/2.2/configs/ranger-usersync-upgrade.json  | 2 +-
 .../src/test/python/stacks/2.3/common/services-sparkts-hive.json | 4 ++--
 .../src/test/python/stacks/2.3/common/services-sparkts.json      | 4 ++--
 ambari-server/src/test/python/stacks/2.3/configs/ats_1_5.json    | 2 +-
 .../src/test/python/stacks/2.3/configs/default.hbasedecom.json   | 2 +-
 .../src/test/python/stacks/2.5/configs/hsi_default.json          | 2 +-
 ambari-server/src/test/resources/deploy_HDP2.sh                  | 2 +-
 .../stacks/HDP/2.0.1/services/YARN/configuration/yarn-site.xml   | 2 +-
 .../stacks/HDP/2.0.5/services/YARN/configuration/yarn-site.xml   | 2 +-
 51 files changed, 53 insertions(+), 53 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml
index bf89165..2810a23 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-site.xml
@@ -259,7 +259,7 @@
     <on-ambari-upgrade add="true"/>
   </property>
   <property>
-    <name>yarn.nodemanager.log.retain-second</name>
+    <name>yarn.nodemanager.log.retain-seconds</name>
     <value>604800</value>
     <description>
       Time in seconds to retain user logs. Only applicable if

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-site.xml
index 452bdd8..7053473 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-site.xml
@@ -198,7 +198,7 @@
     <on-ambari-upgrade add="true"/>
   </property>
   <property>
-    <name>yarn.nodemanager.log.retain-second</name>
+    <name>yarn.nodemanager.log.retain-seconds</name>
     <value>604800</value>
     <description>
       Time in seconds to retain user logs. Only applicable if

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-site.xml
index 49502ad..26aac90 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-site.xml
@@ -198,7 +198,7 @@
     <on-ambari-upgrade add="true"/>
   </property>
   <property>
-    <name>yarn.nodemanager.log.retain-second</name>
+    <name>yarn.nodemanager.log.retain-seconds</name>
     <value>604800</value>
     <description>
       Time in seconds to retain user logs. Only applicable if

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/yarn-site.xml
index 49502ad..26aac90 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/yarn-site.xml
@@ -198,7 +198,7 @@
     <on-ambari-upgrade add="true"/>
   </property>
   <property>
-    <name>yarn.nodemanager.log.retain-second</name>
+    <name>yarn.nodemanager.log.retain-seconds</name>
     <value>604800</value>
     <description>
       Time in seconds to retain user logs. Only applicable if

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json
index d2d059e..94a09b9 100644
--- a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json
+++ b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_1.3_to_2.2.json
@@ -375,7 +375,7 @@
           "yarn.nodemanager.log-aggregation.num-log-files-per-app": "30",
           "yarn.nodemanager.log-aggregation.roll-monitoring-interval-seconds": "-1",
           "yarn.nodemanager.log-dirs": "/hadoop/yarn/log",
-          "yarn.nodemanager.log.retain-second": "604800",
+          "yarn.nodemanager.log.retain-seconds": "604800",
           "yarn.nodemanager.recovery.dir": "/var/log/hadoop-yarn/nodemanager/recovery-state",
           "yarn.nodemanager.recovery.enabled": "false",
           "yarn.nodemanager.remote-app-log-dir": "/app-logs",

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/altfs_plus_hdfs.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/altfs_plus_hdfs.json b/ambari-server/src/test/python/stacks/2.0.6/configs/altfs_plus_hdfs.json
index ff78609..99d2251 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/altfs_plus_hdfs.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/altfs_plus_hdfs.json
@@ -404,7 +404,7 @@
             "yarn.nodemanager.address": "0.0.0.0:45454", 
             "yarn.nodemanager.container-monitor.interval-ms": "3000", 
             "yarn.nodemanager.log-aggregation.compression-type": "gz", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log,/hadoop/yarn/log1",
             "yarn.nodemanager.health-checker.interval-ms": "135000", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/client-upgrade.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/client-upgrade.json b/ambari-server/src/test/python/stacks/2.0.6/configs/client-upgrade.json
index c6d7f60..0b5ba6a 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/client-upgrade.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/client-upgrade.json
@@ -446,7 +446,7 @@
             "yarn.nodemanager.resource.percentage-physical-cpu-limit": "100", 
             "yarn.nodemanager.disk-health-checker.min-free-space-per-disk-mb": "1000", 
             "yarn.nodemanager.log-aggregation.roll-monitoring-interval-seconds": "-1", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log", 
             "yarn.timeline-service.client.max-retries": "30", 
             "yarn.nodemanager.health-checker.interval-ms": "135000", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json
index f8d9b21..adab92f 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json
@@ -385,7 +385,7 @@
             "yarn.nodemanager.address": "0.0.0.0:45454", 
             "yarn.nodemanager.container-monitor.interval-ms": "3000", 
             "yarn.nodemanager.log-aggregation.compression-type": "gz", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log", 
             "yarn.nodemanager.health-checker.interval-ms": "135000", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
index 0aea0ff..f54b645 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
@@ -511,7 +511,7 @@
             "yarn.nodemanager.address": "0.0.0.0:45454",
             "yarn.nodemanager.container-monitor.interval-ms": "3000",
             "yarn.nodemanager.log-aggregation.compression-type": "gz",
-            "yarn.nodemanager.log.retain-second": "604800",
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0",
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log,/hadoop/yarn/log1",
             "yarn.nodemanager.health-checker.interval-ms": "135000",

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json
index 26dc966..e81fe9e 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json
@@ -383,7 +383,7 @@
             "yarn.nodemanager.address": "0.0.0.0:45454", 
             "yarn.nodemanager.container-monitor.interval-ms": "3000", 
             "yarn.nodemanager.log-aggregation.compression-type": "gz", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log,/hadoop/yarn/log1",
             "yarn.nodemanager.health-checker.interval-ms": "135000", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json
index dc6c830..71423c8 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json
@@ -464,7 +464,7 @@
             "yarn.nodemanager.address": "0.0.0.0:45454", 
             "yarn.nodemanager.container-monitor.interval-ms": "3000", 
             "yarn.nodemanager.log-aggregation.compression-type": "gz", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log,/hadoop/yarn/log1",
             "yarn.nodemanager.health-checker.interval-ms": "135000", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json
index d5f9d19..5659ba6 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json
@@ -458,7 +458,7 @@
             "yarn.nodemanager.address": "0.0.0.0:45454", 
             "yarn.nodemanager.container-monitor.interval-ms": "3000", 
             "yarn.nodemanager.log-aggregation.compression-type": "gz", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log,/hadoop/yarn/log1",
             "yarn.nodemanager.health-checker.interval-ms": "135000", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_non_hdfs.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_non_hdfs.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_non_hdfs.json
index 4a91e60..d49868f 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_non_hdfs.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_non_hdfs.json
@@ -500,7 +500,7 @@
             "yarn.nodemanager.address": "0.0.0.0:45454", 
             "yarn.nodemanager.container-monitor.interval-ms": "3000", 
             "yarn.nodemanager.log-aggregation.compression-type": "gz", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log,/hadoop/yarn/log1",
             "yarn.nodemanager.health-checker.interval-ms": "135000", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/default_no_install.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_no_install.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_no_install.json
index 08b57d7..5b8a0af 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_no_install.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_no_install.json
@@ -476,7 +476,7 @@
             "yarn.nodemanager.address": "0.0.0.0:45454", 
             "yarn.nodemanager.container-monitor.interval-ms": "3000", 
             "yarn.nodemanager.log-aggregation.compression-type": "gz", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log,/hadoop/yarn/log1",
             "yarn.nodemanager.health-checker.interval-ms": "135000", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/default_oozie_mysql.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_oozie_mysql.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_oozie_mysql.json
index c4b5722..7378b68 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_oozie_mysql.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_oozie_mysql.json
@@ -405,7 +405,7 @@
             "yarn.nodemanager.address": "0.0.0.0:45454", 
             "yarn.nodemanager.container-monitor.interval-ms": "3000", 
             "yarn.nodemanager.log-aggregation.compression-type": "gz", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log,/hadoop/yarn/log1",
             "yarn.nodemanager.health-checker.interval-ms": "135000", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/default_update_exclude_file_only.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_update_exclude_file_only.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_update_exclude_file_only.json
index 79f0f86..2ea07e4 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_update_exclude_file_only.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_update_exclude_file_only.json
@@ -394,7 +394,7 @@
             "yarn.nodemanager.address": "0.0.0.0:45454", 
             "yarn.nodemanager.container-monitor.interval-ms": "3000", 
             "yarn.nodemanager.log-aggregation.compression-type": "gz", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log,/hadoop/yarn/log1",
             "yarn.nodemanager.health-checker.interval-ms": "135000", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/default_with_bucket.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_with_bucket.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_with_bucket.json
index 6ef3810..a0e7e9d 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_with_bucket.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_with_bucket.json
@@ -508,7 +508,7 @@
             "yarn.nodemanager.address": "0.0.0.0:45454",
             "yarn.nodemanager.container-monitor.interval-ms": "3000",
             "yarn.nodemanager.log-aggregation.compression-type": "gz",
-            "yarn.nodemanager.log.retain-second": "604800",
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0",
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log,/hadoop/yarn/log1",
             "yarn.nodemanager.health-checker.interval-ms": "135000",

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/flume_22.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_22.json b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_22.json
index d9bc7f9..6ec9ec9 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_22.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_22.json
@@ -392,7 +392,7 @@
             "yarn.nodemanager.address": "0.0.0.0:45454", 
             "yarn.nodemanager.container-monitor.interval-ms": "3000", 
             "yarn.nodemanager.log-aggregation.compression-type": "gz", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log,/hadoop/yarn/log1",
             "yarn.nodemanager.health-checker.interval-ms": "135000", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json
index a23b313..b197fde 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json
@@ -472,7 +472,7 @@
             "yarn.nodemanager.address": "0.0.0.0:45454", 
             "yarn.nodemanager.container-monitor.interval-ms": "3000", 
             "yarn.nodemanager.log-aggregation.compression-type": "gz", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log,/hadoop/yarn/log1",
             "yarn.nodemanager.health-checker.interval-ms": "135000", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_active_node.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_active_node.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_active_node.json
index cfd5b17..0e666ba 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_active_node.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_active_node.json
@@ -339,7 +339,7 @@
             "yarn.nodemanager.address": "0.0.0.0:45454", 
             "yarn.nodemanager.container-monitor.interval-ms": "3000", 
             "yarn.nodemanager.log-aggregation.compression-type": "gz", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log", 
             "yarn.nodemanager.health-checker.interval-ms": "135000", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node.json
index ee88983..baec1fa 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node.json
@@ -339,7 +339,7 @@
             "yarn.nodemanager.address": "0.0.0.0:45454", 
             "yarn.nodemanager.container-monitor.interval-ms": "3000", 
             "yarn.nodemanager.log-aggregation.compression-type": "gz", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log", 
             "yarn.nodemanager.health-checker.interval-ms": "135000", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start.json
index b685773..61b9fe0 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start.json
@@ -340,7 +340,7 @@
             "yarn.nodemanager.address": "0.0.0.0:45454", 
             "yarn.nodemanager.container-monitor.interval-ms": "3000", 
             "yarn.nodemanager.log-aggregation.compression-type": "gz", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log", 
             "yarn.nodemanager.health-checker.interval-ms": "135000", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start_dfs_nameservices.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start_dfs_nameservices.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start_dfs_nameservices.json
index 0ea8b16..6b57397 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start_dfs_nameservices.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start_dfs_nameservices.json
@@ -340,7 +340,7 @@
             "yarn.nodemanager.address": "0.0.0.0:45454", 
             "yarn.nodemanager.container-monitor.interval-ms": "3000", 
             "yarn.nodemanager.log-aggregation.compression-type": "gz", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log", 
             "yarn.nodemanager.health-checker.interval-ms": "135000", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json
index e605c05..1cdb982 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json
@@ -343,7 +343,7 @@
             "yarn.nodemanager.address": "0.0.0.0:45454", 
             "yarn.nodemanager.container-monitor.interval-ms": "3000", 
             "yarn.nodemanager.log-aggregation.compression-type": "gz", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log", 
             "yarn.nodemanager.health-checker.interval-ms": "135000", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json
index bf815a2..15902af 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json
@@ -313,7 +313,7 @@
             "yarn.nodemanager.principal": "nm/_HOST@EXAMPLE.COM", 
             "yarn.nodemanager.local-dirs": "/hadoop/yarn/local", 
             "yarn.nodemanager.log-aggregation.compression-type": "gz", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0", 
             "yarn.nodemanager.keytab": "/etc/security/keytabs/nm.service.keytab", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-2.2.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-2.2.json b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-2.2.json
index c79d029..e6a8676 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-2.2.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-2.2.json
@@ -428,7 +428,7 @@
             "yarn.nodemanager.resource.percentage-physical-cpu-limit": "100", 
             "yarn.nodemanager.disk-health-checker.min-free-space-per-disk-mb": "1000", 
             "yarn.nodemanager.log-aggregation.roll-monitoring-interval-seconds": "-1", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log", 
             "yarn.timeline-service.client.max-retries": "30", 
             "yarn.nodemanager.health-checker.interval-ms": "135000", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-check-2.2.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-check-2.2.json b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-check-2.2.json
index 555c160..6f3d4ee 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-check-2.2.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-check-2.2.json
@@ -423,7 +423,7 @@
             "yarn.nodemanager.resource.percentage-physical-cpu-limit": "100", 
             "yarn.nodemanager.disk-health-checker.min-free-space-per-disk-mb": "1000", 
             "yarn.nodemanager.log-aggregation.roll-monitoring-interval-seconds": "-1", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log", 
             "yarn.timeline-service.client.max-retries": "30", 
             "yarn.nodemanager.health-checker.interval-ms": "135000", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2-phoenix.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2-phoenix.json b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2-phoenix.json
index 44db842..b1d603b 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2-phoenix.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2-phoenix.json
@@ -428,7 +428,7 @@
             "yarn.nodemanager.resource.percentage-physical-cpu-limit": "100", 
             "yarn.nodemanager.disk-health-checker.min-free-space-per-disk-mb": "1000", 
             "yarn.nodemanager.log-aggregation.roll-monitoring-interval-seconds": "-1", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log", 
             "yarn.timeline-service.client.max-retries": "30", 
             "yarn.nodemanager.health-checker.interval-ms": "135000", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json
index 58827ae..435291a 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json
@@ -428,7 +428,7 @@
             "yarn.nodemanager.resource.percentage-physical-cpu-limit": "100", 
             "yarn.nodemanager.disk-health-checker.min-free-space-per-disk-mb": "1000", 
             "yarn.nodemanager.log-aggregation.roll-monitoring-interval-seconds": "-1", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log", 
             "yarn.timeline-service.client.max-retries": "30", 
             "yarn.nodemanager.health-checker.interval-ms": "135000", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/oozie_existing_sqla.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/oozie_existing_sqla.json b/ambari-server/src/test/python/stacks/2.0.6/configs/oozie_existing_sqla.json
index 65a14a6..8d12b98 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/oozie_existing_sqla.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/oozie_existing_sqla.json
@@ -403,7 +403,7 @@
             "yarn.nodemanager.address": "0.0.0.0:45454",
             "yarn.nodemanager.container-monitor.interval-ms": "3000",
             "yarn.nodemanager.log-aggregation.compression-type": "gz",
-            "yarn.nodemanager.log.retain-second": "604800",
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0",
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log,/hadoop/yarn/log1",
             "yarn.nodemanager.health-checker.interval-ms": "135000",

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/rebalancehdfs_default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/rebalancehdfs_default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/rebalancehdfs_default.json
index d9e3a9e..b662bd7 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/rebalancehdfs_default.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/rebalancehdfs_default.json
@@ -262,7 +262,7 @@
             "yarn.timeline-service.webapp.address": "c6402.ambari.apache.org:8188", 
             "yarn.timeline-service.enabled": "true", 
             "yarn.timeline-service.address": "c6402.ambari.apache.org:10200", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0", 
             "yarn.timeline-service.store-class": "org.apache.hadoop.yarn.server.timeline.LeveldbTimelineStore", 
             "yarn.nodemanager.log-aggregation.compression-type": "gz", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/rebalancehdfs_secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/rebalancehdfs_secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/rebalancehdfs_secured.json
index 597fe94..ba10950 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/rebalancehdfs_secured.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/rebalancehdfs_secured.json
@@ -264,7 +264,7 @@
             "yarn.timeline-service.webapp.address": "c6402.ambari.apache.org:8188", 
             "yarn.timeline-service.enabled": "true", 
             "yarn.timeline-service.address": "c6402.ambari.apache.org:10200", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0", 
             "yarn.timeline-service.store-class": "org.apache.hadoop.yarn.server.timeline.LeveldbTimelineStore", 
             "yarn.nodemanager.log-aggregation.compression-type": "gz", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
index e905555..890b9f1 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
@@ -562,7 +562,7 @@
             "yarn.nodemanager.principal": "nm/_HOST@EXAMPLE.COM", 
             "yarn.nodemanager.local-dirs": "/hadoop/yarn/local", 
             "yarn.nodemanager.log-aggregation.compression-type": "gz", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0", 
             "yarn.nodemanager.keytab": "/etc/security/keytabs/nm.service.keytab", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json
index 48e9756..699c1f5 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json
@@ -508,7 +508,7 @@
             "yarn.nodemanager.principal": "nm/_HOST@EXAMPLE.COM", 
             "yarn.nodemanager.local-dirs": "/hadoop/yarn/local", 
             "yarn.nodemanager.log-aggregation.compression-type": "gz", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0", 
             "yarn.nodemanager.keytab": "/etc/security/keytabs/nm.service.keytab", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json
index 3eac379..fa4cc9d 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json
@@ -584,7 +584,7 @@
             "yarn.nodemanager.principal": "nm/_HOST@EXAMPLE.COM", 
             "yarn.nodemanager.local-dirs": "/hadoop/yarn/local", 
             "yarn.nodemanager.log-aggregation.compression-type": "gz", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0", 
             "yarn.nodemanager.keytab": "/etc/security/keytabs/nm.service.keytab", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.1/configs/client-upgrade.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/configs/client-upgrade.json b/ambari-server/src/test/python/stacks/2.1/configs/client-upgrade.json
index 6516483..013bb8b 100644
--- a/ambari-server/src/test/python/stacks/2.1/configs/client-upgrade.json
+++ b/ambari-server/src/test/python/stacks/2.1/configs/client-upgrade.json
@@ -417,7 +417,7 @@
             "yarn.nodemanager.resource.percentage-physical-cpu-limit": "100", 
             "yarn.nodemanager.disk-health-checker.min-free-space-per-disk-mb": "1000", 
             "yarn.nodemanager.log-aggregation.roll-monitoring-interval-seconds": "-1", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log", 
             "yarn.timeline-service.client.max-retries": "30", 
             "yarn.nodemanager.health-checker.interval-ms": "135000", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.1/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/configs/default.json b/ambari-server/src/test/python/stacks/2.1/configs/default.json
index 7c33c52..49c8a7b 100644
--- a/ambari-server/src/test/python/stacks/2.1/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.1/configs/default.json
@@ -582,7 +582,7 @@
             "yarn.nodemanager.address": "0.0.0.0:45454", 
             "yarn.nodemanager.container-monitor.interval-ms": "3000", 
             "yarn.nodemanager.log-aggregation.compression-type": "gz", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log", 
             "yarn.nodemanager.health-checker.interval-ms": "135000", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.1/configs/secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/configs/secured.json b/ambari-server/src/test/python/stacks/2.1/configs/secured.json
index a2af06a..0e4bfc3 100644
--- a/ambari-server/src/test/python/stacks/2.1/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/2.1/configs/secured.json
@@ -560,7 +560,7 @@
             "yarn.nodemanager.principal": "nm/_HOST@EXAMPLE.COM", 
             "yarn.nodemanager.local-dirs": "/hadoop/yarn/local", 
             "yarn.nodemanager.log-aggregation.compression-type": "gz", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0", 
             "yarn.nodemanager.keytab": "/etc/security/keytabs/nm.service.keytab", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade-hdfs-secure.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade-hdfs-secure.json b/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade-hdfs-secure.json
index 928e313..03068e5 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade-hdfs-secure.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade-hdfs-secure.json
@@ -817,7 +817,7 @@
             "yarn.nodemanager.resource.percentage-physical-cpu-limit": "100", 
             "yarn.nodemanager.disk-health-checker.min-free-space-per-disk-mb": "1000", 
             "yarn.nodemanager.log-aggregation.roll-monitoring-interval-seconds": "-1", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.timeline-service.principal": "yarn/_HOST@EXAMPLE.COM", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log", 
             "yarn.timeline-service.client.max-retries": "30", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade.json
index 1a8b71e..7f874cd 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade.json
@@ -817,7 +817,7 @@
             "yarn.nodemanager.resource.percentage-physical-cpu-limit": "100", 
             "yarn.nodemanager.disk-health-checker.min-free-space-per-disk-mb": "1000", 
             "yarn.nodemanager.log-aggregation.roll-monitoring-interval-seconds": "-1", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.timeline-service.principal": "yarn/_HOST@EXAMPLE.COM", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log", 
             "yarn.timeline-service.client.max-retries": "30", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.2/configs/pig-service-check-secure.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/pig-service-check-secure.json b/ambari-server/src/test/python/stacks/2.2/configs/pig-service-check-secure.json
index 729ce78..0d0c6f5 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/pig-service-check-secure.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/pig-service-check-secure.json
@@ -430,7 +430,7 @@
             "yarn.nodemanager.disk-health-checker.min-free-space-per-disk-mb": "1000", 
             "yarn.resourcemanager.webapp.spnego-keytab-file": "/etc/security/keytabs/spnego.service.keytab", 
             "yarn.nodemanager.log-aggregation.roll-monitoring-interval-seconds": "-1", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.timeline-service.http-authentication.type": "kerberos", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log", 
             "yarn.resourcemanager.proxyusers.*.groups": "", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-upgrade.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-upgrade.json
index 79a5ec1..cbe8ebe 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-upgrade.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-upgrade.json
@@ -695,7 +695,7 @@
             "yarn.nodemanager.resource.percentage-physical-cpu-limit": "100", 
             "yarn.nodemanager.disk-health-checker.min-free-space-per-disk-mb": "1000", 
             "yarn.nodemanager.log-aggregation.roll-monitoring-interval-seconds": "-1", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.timeline-service.principal": "yarn/_HOST@EXAMPLE.COM", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log", 
             "yarn.timeline-service.client.max-retries": "30", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.2/configs/ranger-usersync-upgrade.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/ranger-usersync-upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/ranger-usersync-upgrade.json
index 879dfae..dc4c43b 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/ranger-usersync-upgrade.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/ranger-usersync-upgrade.json
@@ -690,7 +690,7 @@
             "yarn.nodemanager.resource.percentage-physical-cpu-limit": "100", 
             "yarn.nodemanager.disk-health-checker.min-free-space-per-disk-mb": "1000", 
             "yarn.nodemanager.log-aggregation.roll-monitoring-interval-seconds": "-1", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.timeline-service.principal": "yarn/_HOST@EXAMPLE.COM", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log", 
             "yarn.timeline-service.client.max-retries": "30", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.3/common/services-sparkts-hive.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/common/services-sparkts-hive.json b/ambari-server/src/test/python/stacks/2.3/common/services-sparkts-hive.json
index 20a672e..fe53614 100644
--- a/ambari-server/src/test/python/stacks/2.3/common/services-sparkts-hive.json
+++ b/ambari-server/src/test/python/stacks/2.3/common/services-sparkts-hive.json
@@ -8454,10 +8454,10 @@
       },
       "dependencies" : [ ]
     }, {
-      "href" : "/api/v1/stacks/HDP/versions/2.3/services/YARN/configurations/yarn.nodemanager.log.retain-second",
+      "href" : "/api/v1/stacks/HDP/versions/2.3/services/YARN/configurations/yarn.nodemanager.log.retain-seconds",
       "StackConfigurations" : {
         "property_depends_on" : [ ],
-        "property_name" : "yarn.nodemanager.log.retain-second",
+        "property_name" : "yarn.nodemanager.log.retain-seconds",
         "service_name" : "YARN",
         "stack_name" : "HDP",
         "stack_version" : "2.3",

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.3/common/services-sparkts.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/common/services-sparkts.json b/ambari-server/src/test/python/stacks/2.3/common/services-sparkts.json
index f41944b..6514f3e 100644
--- a/ambari-server/src/test/python/stacks/2.3/common/services-sparkts.json
+++ b/ambari-server/src/test/python/stacks/2.3/common/services-sparkts.json
@@ -4318,10 +4318,10 @@
       },
       "dependencies" : [ ]
     }, {
-      "href" : "/api/v1/stacks/HDP/versions/2.3/services/YARN/configurations/yarn.nodemanager.log.retain-second",
+      "href" : "/api/v1/stacks/HDP/versions/2.3/services/YARN/configurations/yarn.nodemanager.log.retain-seconds",
       "StackConfigurations" : {
         "property_depends_on" : [ ],
-        "property_name" : "yarn.nodemanager.log.retain-second",
+        "property_name" : "yarn.nodemanager.log.retain-seconds",
         "service_name" : "YARN",
         "stack_name" : "HDP",
         "stack_version" : "2.3",

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.3/configs/ats_1_5.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/configs/ats_1_5.json b/ambari-server/src/test/python/stacks/2.3/configs/ats_1_5.json
index 3fe1235..b4342ad 100644
--- a/ambari-server/src/test/python/stacks/2.3/configs/ats_1_5.json
+++ b/ambari-server/src/test/python/stacks/2.3/configs/ats_1_5.json
@@ -457,7 +457,7 @@
             "yarn.nodemanager.address": "0.0.0.0:45454", 
             "yarn.nodemanager.container-monitor.interval-ms": "3000", 
             "yarn.nodemanager.log-aggregation.compression-type": "gz", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log,/hadoop/yarn/log1",
             "yarn.nodemanager.health-checker.interval-ms": "135000", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.3/configs/default.hbasedecom.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/configs/default.hbasedecom.json b/ambari-server/src/test/python/stacks/2.3/configs/default.hbasedecom.json
index fff0024..ad21c9b 100644
--- a/ambari-server/src/test/python/stacks/2.3/configs/default.hbasedecom.json
+++ b/ambari-server/src/test/python/stacks/2.3/configs/default.hbasedecom.json
@@ -385,7 +385,7 @@
             "yarn.nodemanager.address": "0.0.0.0:45454", 
             "yarn.nodemanager.container-monitor.interval-ms": "3000", 
             "yarn.nodemanager.log-aggregation.compression-type": "gz", 
-            "yarn.nodemanager.log.retain-second": "604800", 
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log", 
             "yarn.nodemanager.health-checker.interval-ms": "135000", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/python/stacks/2.5/configs/hsi_default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.5/configs/hsi_default.json b/ambari-server/src/test/python/stacks/2.5/configs/hsi_default.json
index f4451fc..ffdd5e9 100644
--- a/ambari-server/src/test/python/stacks/2.5/configs/hsi_default.json
+++ b/ambari-server/src/test/python/stacks/2.5/configs/hsi_default.json
@@ -542,7 +542,7 @@
             "yarn.nodemanager.address": "0.0.0.0:45454",
             "yarn.nodemanager.container-monitor.interval-ms": "3000",
             "yarn.nodemanager.log-aggregation.compression-type": "gz",
-            "yarn.nodemanager.log.retain-second": "604800",
+            "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.nodemanager.delete.debug-delay-sec": "0",
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log,/hadoop/yarn/log1",
             "yarn.nodemanager.health-checker.interval-ms": "135000",

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/resources/deploy_HDP2.sh
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/deploy_HDP2.sh b/ambari-server/src/test/resources/deploy_HDP2.sh
index e9a9396..c21468b 100644
--- a/ambari-server/src/test/resources/deploy_HDP2.sh
+++ b/ambari-server/src/test/resources/deploy_HDP2.sh
@@ -31,7 +31,7 @@ curl -i -X PUT -d '{"Clusters":{"desired_configs":{"type":"mapred-queue-acls","t
 echo "-----------------------mapred-queue-acls-----------------------"
 curl -i -X PUT -d '{"Clusters":{"desired_configs":{"type":"mapred-site","tag":"version1","properties":{"io.sort.mb":"","io.sort.record.percent":".2","io.sort.spill.percent":"","io.sort.factor":"100","mapred.tasktracker.tasks.sleeptime-before-sigkill":"250","mapred.job.tracker.handler.count":"50","mapred.system.dir":"/mapred/system","mapred.job.tracker":"","mapred.job.tracker.http.address":"","mapred.local.dir":"","mapreduce.cluster.administrators":"hadoop","mapred.reduce.parallel.copies":"30","mapred.tasktracker.map.tasks.maximum":"","mapred.tasktracker.reduce.tasks.maximum":"","tasktracker.http.threads":"50","mapred.map.tasks.speculative.execution":"false","mapred.reduce.tasks.speculative.execution":"false","mapred.reduce.slowstart.completed.maps":"0.05","mapred.inmem.merge.threshold":"1000","mapred.job.shuffle.merge.percent":"0.66","mapred.job.shuffle.input.buffer.percent":"0.7","mapred.map.output.compression.codec":"","mapred.output.compression.type":"BLOCK","mapred.jobtracker.co
 mpleteuserjobs.maximum":"0","mapred.jobtracker.taskScheduler":"","mapred.jobtracker.restart.recover":"false","mapred.job.reduce.input.buffer.percent":"0.0","mapreduce.reduce.input.limit":"10737418240","mapred.compress.map.output":"","mapred.task.timeout":"600000","jetty.connector":"org.mortbay.jetty.nio.SelectChannelConnector","mapred.task.tracker.task-controller":"","mapred.child.root.logger":"INFO,TLA","mapred.child.java.opts":"","mapred.cluster.map.memory.mb":"","mapred.cluster.reduce.memory.mb":"","mapred.job.map.memory.mb":"","mapred.job.reduce.memory.mb":"","mapred.cluster.max.map.memory.mb":"","mapred.cluster.max.reduce.memory.mb":"","mapred.hosts":"","mapred.hosts.exclude":"","mapred.max.tracker.blacklists":"16","mapred.healthChecker.script.path":"","mapred.healthChecker.interval":"135000","mapred.healthChecker.script.timeout":"60000","mapred.job.tracker.persist.jobstatus.active":"false","mapred.job.tracker.persist.jobstatus.hours":"1","mapred.job.tracker.persist.jobstatus.d
 ir":"","mapred.jobtracker.retirejob.check":"10000","mapred.jobtracker.retirejob.interval":"0","mapred.job.tracker.history.completed.location":"/mapred/history/done","mapred.task.maxvmem":"","mapred.jobtracker.maxtasks.per.job":"","mapreduce.fileoutputcommitter.marksuccessfuljobs":"false","mapred.userlog.retain.hours":"","mapred.job.reuse.jvm.num.tasks":"1","mapreduce.jobtracker.kerberos.principal":"","mapreduce.tasktracker.kerberos.principal":"","hadoop.job.history.user.location":"none","mapreduce.jobtracker.keytab.file":"","mapreduce.tasktracker.keytab.file":"","mapreduce.jobtracker.staging.root.dir":"/user","mapreduce.tasktracker.group":"hadoop","mapreduce.jobtracker.split.metainfo.maxsize":"50000000","mapreduce.history.server.embedded":"false","mapreduce.history.server.http.address":"","mapreduce.jobhistory.kerberos.principal":"","mapreduce.jobhistory.keytab.file":"","mapred.jobtracker.blacklist.fault-timeout-window":"180","mapred.jobtracker.blacklist.fault-bucket-width":"15","ma
 pred.queue.names":"default","mapreduce.shuffle.port":"8081","mapreduce.jobhistory.intermediate-done-dir" : "/mr-history/tmp","mapreduce.jobhistory.done-dir" : "/mr-history/done"}}}}' -u admin:admin http://localhost:8080/api/v1/clusters/c1
 echo "-----------------------mapred-site-----------------------"
-curl -i -X PUT -d `echo '{"Clusters":{"desired_configs":{"type":"yarn-site","tag":"version1","properties":{"yarn.resourcemanager.resource-tracker.address":"HOST:8025","yarn.resourcemanager.scheduler.address":"HOST:8030","yarn.resourcemanager.address":"HOST:8050","yarn.resourcemanager.admin.address":"HOST:8141","yarn.resourcemanager.scheduler.class":"org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler","yarn.scheduler.minimum-allocation-mb":"1024","yarn.scheduler.maximum-allocation-mb":"8192","yarn.nodemanager.address":"0.0.0.0:45454","yarn.nodemanager.local-dirs":"/yarn/loc/dir","yarn.nodemanager.resource.memory-mb":"8192","yarn.application.classpath":"/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/*,/usr/lib/ambari-server/*","yarn.nodemanager.vmem-pmem-ratio":"2.1","yarn.nodemanager.con
 tainer-executor.class":"org.apache.hadoop.yarn.server.nodemanager.DefaultContainerExecutor","yarn.nodemanager.aux-services":"mapreduce.shuffle","yarn.nodemanager.aux-services.class":"org.apache.hadoop.mapred.ShuffleHandler","yarn.nodemanager.log-dirs":"/var/log/hadoop-yarn/yarn","yarn.nodemanager.container-monitor.interval-ms":"3000","yarn.nodemanager.health-checker.script.path":"/etc/hadoop/conf/health_check","yarn.nodemanager.health-checker.interval-ms":"135000","yarn.nodemanager.health-checker.script.timeout-ms":"60000","yarn.nodemanager.log.retain-second":"604800","yarn.log-aggregation-enable":"true","yarn.nodemanager.remote-app-log-dir":"/app-logs","yarn.nodemanager.remote-app-log-dir-suffix":"logs","yarn.nodemanager.log-aggregation.compression-type":"gz","yarn.nodemanager.delete.debug-delay-sec":"36000"}}}}'| sed s/HOST/$HOST/g` -u admin:admin http://localhost:8080/api/v1/clusters/c1
+curl -i -X PUT -d `echo '{"Clusters":{"desired_configs":{"type":"yarn-site","tag":"version1","properties":{"yarn.resourcemanager.resource-tracker.address":"HOST:8025","yarn.resourcemanager.scheduler.address":"HOST:8030","yarn.resourcemanager.address":"HOST:8050","yarn.resourcemanager.admin.address":"HOST:8141","yarn.resourcemanager.scheduler.class":"org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler","yarn.scheduler.minimum-allocation-mb":"1024","yarn.scheduler.maximum-allocation-mb":"8192","yarn.nodemanager.address":"0.0.0.0:45454","yarn.nodemanager.local-dirs":"/yarn/loc/dir","yarn.nodemanager.resource.memory-mb":"8192","yarn.application.classpath":"/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/*,/usr/lib/ambari-server/*","yarn.nodemanager.vmem-pmem-ratio":"2.1","yarn.nodemanager.con
 tainer-executor.class":"org.apache.hadoop.yarn.server.nodemanager.DefaultContainerExecutor","yarn.nodemanager.aux-services":"mapreduce.shuffle","yarn.nodemanager.aux-services.class":"org.apache.hadoop.mapred.ShuffleHandler","yarn.nodemanager.log-dirs":"/var/log/hadoop-yarn/yarn","yarn.nodemanager.container-monitor.interval-ms":"3000","yarn.nodemanager.health-checker.script.path":"/etc/hadoop/conf/health_check","yarn.nodemanager.health-checker.interval-ms":"135000","yarn.nodemanager.health-checker.script.timeout-ms":"60000","yarn.nodemanager.log.retain-seconds":"604800","yarn.log-aggregation-enable":"true","yarn.nodemanager.remote-app-log-dir":"/app-logs","yarn.nodemanager.remote-app-log-dir-suffix":"logs","yarn.nodemanager.log-aggregation.compression-type":"gz","yarn.nodemanager.delete.debug-delay-sec":"36000"}}}}'| sed s/HOST/$HOST/g` -u admin:admin http://localhost:8080/api/v1/clusters/c1
 echo "-----------------------yarn-site-----------------------"
 curl -i -X PUT -d `echo '{"Clusters":{"desired_configs":{"type":"hive-site","tag":"version1","properties":{"hive.security.authorization.manager":"org.apache.hcatalog.security.HdfsAuthorizationProvider","hive.metastore.warehouse.dir":"/apps/hive/warehouse","hive.metastore.execute.setugi":"true","javax.jdo.option.ConnectionDriverName":"com.mysql.jdbc.Driver","hive.security.authorization.enabled":"true","hadoop.clientside.fs.operations":"true","fs.hdfs.impl.disable.cache":"true","hive.server2.enable.doAs":"true","hive.metastore.client.socket.timeout":"60","hive.metastore.cache.pinobjtypes":"Table,Database,Type,FieldSchema,Order","hive.metastore.local":"false","javax.jdo.option.ConnectionUserName":"hive","javax.jdo.option.ConnectionPassword":"admin","hive.metastore.uris":"thrift://HOST:9083","javax.jdo.option.ConnectionURL":"jdbc:mysql://HOST/hive?createDatabaseIfNotExist=true"}}}}'| sed s/HOST/$HOST/g` -u admin:admin http://localhost:8080/api/v1/clusters/c1
 echo "-----------------------hive-site-----------------------"

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/YARN/configuration/yarn-site.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/YARN/configuration/yarn-site.xml
index 25b9841..b45fef6 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/YARN/configuration/yarn-site.xml
@@ -134,7 +134,7 @@
     <on-ambari-upgrade add="true"/>
   </property>
   <property>
-    <name>yarn.nodemanager.log.retain-second</name>
+    <name>yarn.nodemanager.log.retain-seconds</name>
     <value>604800</value>
     <on-ambari-upgrade add="true"/>
   </property>

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86ef73/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/configuration/yarn-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/configuration/yarn-site.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/configuration/yarn-site.xml
index d2111d7..be9e0bf 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/configuration/yarn-site.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/YARN/configuration/yarn-site.xml
@@ -187,7 +187,7 @@
     <on-ambari-upgrade add="true"/>
   </property>
   <property>
-    <name>yarn.nodemanager.log.retain-second</name>
+    <name>yarn.nodemanager.log.retain-seconds</name>
     <value>604800</value>
     <description>
       Time in seconds to retain user logs. Only applicable if


Mime
View raw message