You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/10/15 08:55:32 UTC

ambari git commit: AMBARI-13389 Incorrect accounts names on Admin->Service Account page. (ababiichuk)

Repository: ambari
Updated Branches:
  refs/heads/trunk 8c972fc52 -> bb65cc049


AMBARI-13389 Incorrect accounts names on Admin->Service Account page. (ababiichuk)


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

Branch: refs/heads/trunk
Commit: bb65cc04937d75c35606ed737299ecd894af69d4
Parents: 8c972fc
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Mon Oct 12 17:25:51 2015 +0300
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Thu Oct 15 09:53:46 2015 +0300

----------------------------------------------------------------------
 .../ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml          | 1 +
 .../AMBARI_METRICS/0.1.0/configuration/ams-env.xml               | 1 +
 .../common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml  | 1 +
 .../FALCON/0.5.0.2.1/configuration/falcon-env.xml                | 1 +
 .../common-services/FLUME/1.4.0.2.0/configuration/flume-env.xml  | 1 +
 .../common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml | 1 +
 .../common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml  | 2 ++
 .../common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml   | 3 +++
 .../common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml  | 1 +
 .../common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml    | 2 ++
 .../MAHOUT/1.0.0.2.3/configuration/mahout-env.xml                | 1 +
 .../common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml  | 1 +
 .../RANGER_KMS/0.5.0.2.3/configuration/kms-env.xml               | 2 ++
 .../common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml  | 2 ++
 .../common-services/SQOOP/1.4.4.2.0/configuration/sqoop-env.xml  | 1 +
 .../common-services/STORM/0.9.1.2.1/configuration/storm-env.xml  | 1 +
 .../common-services/TEZ/0.4.0.2.1/configuration/tez-env.xml      | 1 +
 .../YARN/2.1.0.2.0/configuration-mapred/mapred-env.xml           | 1 +
 .../common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml    | 1 +
 .../ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml          | 1 +
 .../resources/stacks/BIGTOP/0.8/configuration/cluster-env.xml    | 2 ++
 .../stacks/BIGTOP/0.8/services/FLUME/configuration/flume-env.xml | 1 +
 .../stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml | 1 +
 .../stacks/BIGTOP/0.8/services/HDFS/configuration/hadoop-env.xml | 2 ++
 .../stacks/BIGTOP/0.8/services/HIVE/configuration/hive-env.xml   | 3 +++
 .../stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-env.xml | 1 +
 .../BIGTOP/0.8/services/YARN/configuration-mapred/mapred-env.xml | 1 +
 .../stacks/BIGTOP/0.8/services/YARN/configuration/yarn-env.xml   | 1 +
 .../0.8/services/ZOOKEEPER/configuration/zookeeper-env.xml       | 1 +
 .../services/GLUSTERFS/configuration/hadoop-env.xml              | 2 ++
 .../HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-env.xml | 1 +
 .../resources/stacks/HDP/2.0.6/configuration/cluster-env.xml     | 2 ++
 .../2.1.GlusterFS/services/FALCON/configuration/falcon-env.xml   | 1 +
 .../services/GLUSTERFS/configuration/hadoop-env.xml              | 2 ++
 .../HDP/2.1.GlusterFS/services/STORM/configuration/storm-env.xml | 1 +
 .../HDP/2.1.GlusterFS/services/TEZ/configuration/tez-env.xml     | 1 +
 .../HDP/2.1.GlusterFS/services/YARN/configuration/yarn-env.xml   | 1 +
 .../stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml    | 1 +
 .../services/GLUSTERFS/configuration/hadoop-env.xml              | 2 ++
 .../resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml    | 2 ++
 .../stacks/HDP/0.2/services/HDFS/configuration/hadoop-env.xml    | 4 ++++
 .../HDP/2.0.6.1/services/FLUME/configuration/flume-env.xml       | 1 +
 .../stacks/HDP/2.0.6/services/FLUME/configuration/flume-env.xml  | 1 +
 .../HDP/0.2/services/HDFS/configuration/hadoop-env.xml           | 3 +++
 44 files changed, 64 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
index 4e82773..e9969d4 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
@@ -90,6 +90,7 @@
   </property>
   <property>
     <name>accumulo_user</name>
+    <display-name>Accumulo User</display-name>
     <value>accumulo</value>
     <property-type>USER</property-type>
     <description>User for running Accumulo server processes.</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml
index 3463af3..8705435 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml
@@ -21,6 +21,7 @@
 <configuration>
   <property>
     <name>ambari_metrics_user</name>
+    <display-name>Ambari Metrics User</display-name>
     <value>ams</value>
     <property-type>USER</property-type>
     <description>Ambari Metrics User Name.</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
index 0ca741c..7d72ee4 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/atlas-env.xml
@@ -31,6 +31,7 @@
   </property>
   <property>
     <name>metadata_user</name>
+    <display-name>Metadata User</display-name>
     <value>atlas</value>
     <property-type>USER</property-type>
     <description>Metadata User Name.</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml
index f5afd95..00c15d8 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-env.xml
@@ -21,6 +21,7 @@
 <configuration>
   <property>
     <name>falcon_user</name>
+    <display-name>Falcon User</display-name>
     <value>falcon</value>
     <property-type>USER</property-type>
     <description>Falcon user.</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-env.xml b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-env.xml
index b1283dd..5c20c08 100644
--- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-env.xml
+++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-env.xml
@@ -48,6 +48,7 @@
   </property>
   <property>
     <name>flume_user</name>
+    <display-name>Flume User</display-name>
     <value>flume</value>
     <property-type>USER</property-type>
     <description>Flume User</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
index f1dd64f..2eeea9c 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml
@@ -88,6 +88,7 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
   </property>
   <property>
     <name>hbase_user</name>
+    <display-name>HBase User</display-name>
     <value>hbase</value>
     <property-type>USER</property-type>
     <description>HBase User Name.</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
index 5d1d976..a8f7951 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml
@@ -163,12 +163,14 @@
   </property>
   <property>
     <name>proxyuser_group</name>
+    <display-name>Proxy User Group</display-name>
     <value>users</value>
     <property-type>GROUP</property-type>
     <description>Proxy user group.</description>
   </property>
   <property>
     <name>hdfs_user</name>
+    <display-name>HDFS User</display-name>
     <value>hdfs</value>
     <property-type>USER</property-type>
     <description>User to run HDFS as</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
index c60d076..0566beb 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
@@ -107,6 +107,7 @@
   </property>
   <property>
     <name>hive_user</name>
+    <display-name>Hive User</display-name>
     <value>hive</value>
     <property-type>USER</property-type>
     <description>Hive User.</description>
@@ -136,12 +137,14 @@
   </property>
   <property>
     <name>hcat_user</name>
+    <display-name>HCat User</display-name>
     <value>hcat</value>
     <property-type>USER</property-type>
     <description>HCat User.</description>
   </property>
   <property>
     <name>webhcat_user</name>
+    <display-name>WebHCat User</display-name>
     <value>hcat</value>
     <property-type>USER</property-type>
     <description>WebHCat User.</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml
index d515e73..77bcea0 100644
--- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml
+++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml
@@ -23,6 +23,7 @@
 <configuration>
   <property>
     <name>kafka_user</name>
+    <display-name>Kafka User</display-name>
     <value>kafka</value>
     <property-type>USER</property-type>
     <description></description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml
index 1d32afd..275cbad 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml
@@ -37,6 +37,7 @@
 
   <property>
     <name>knox_user</name>
+    <display-name>Knox User</display-name>
     <value>knox</value>
     <property-type>USER</property-type>
     <description>Knox Username.</description>
@@ -44,6 +45,7 @@
 
   <property>
     <name>knox_group</name>
+    <display-name>Knox Group</display-name>
     <value>knox</value>
     <property-type>GROUP</property-type>
     <description>Knox Group.</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-env.xml b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-env.xml
index da19a0b..ef402d8 100644
--- a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-env.xml
+++ b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/configuration/mahout-env.xml
@@ -23,6 +23,7 @@
 <configuration>
     <property>
         <name>mahout_user</name>
+        <display-name>Mahout User</display-name>
         <value>mahout</value>
         <property-type>USER</property-type>
         <description>Mahout user</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
index ac7ea04..69cb39f 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-env.xml
@@ -23,6 +23,7 @@
 <configuration>
   <property>
     <name>oozie_user</name>
+    <display-name>Oozie User</display-name>
     <value>oozie</value>
     <property-type>USER</property-type>
     <description>Oozie User.</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-env.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-env.xml
index b12f549..10c14ac 100644
--- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-env.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-env.xml
@@ -22,6 +22,7 @@
 
   <property>
     <name>kms_user</name>
+    <display-name>Kms User</display-name>
     <value>kms</value>
     <property-type>USER</property-type>
     <description>Kms username</description>
@@ -29,6 +30,7 @@
 
   <property>
     <name>kms_group</name>
+    <display-name>Kms group</display-name>
     <value>kms</value>
     <property-type>GROUP</property-type>
     <description>Kms group</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml
index 96341d8..79e3b52 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-env.xml
@@ -23,12 +23,14 @@
 <configuration>
   <property>
     <name>spark_user</name>
+    <display-name>Spark User</display-name>
     <value>spark</value>
     <property-type>USER</property-type>
   </property>
 
   <property>
     <name>spark_group</name>
+    <display-name>Spark Group</display-name>
     <value>spark</value>
     <property-type>GROUP</property-type>
     <description>spark group</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-env.xml b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-env.xml
index 82fa9d0..049d8e6 100644
--- a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-env.xml
+++ b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/configuration/sqoop-env.xml
@@ -47,6 +47,7 @@ export SQOOP_USER_CLASSPATH="`ls ${HIVE_HOME}/lib/libthrift-*.jar 2> /dev/null`:
   </property>
   <property>
     <name>sqoop_user</name>
+    <display-name>Sqoop User</display-name>
     <description>User to run Sqoop as</description>
     <property-type>USER</property-type>
     <value>sqoop</value>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml
index 5129d87..be5e465 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/configuration/storm-env.xml
@@ -23,6 +23,7 @@
 <configuration>
   <property>
     <name>storm_user</name>
+    <display-name>Storm User</display-name>
     <value>storm</value>
     <property-type>USER</property-type>
     <description></description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-env.xml b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-env.xml
index a1eac56..22f5acf 100644
--- a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-env.xml
+++ b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/configuration/tez-env.xml
@@ -23,6 +23,7 @@
 <configuration>
   <property>
     <name>tez_user</name>
+    <display-name>Tez User</display-name>
     <value>tez</value>
     <property-type>USER</property-type>
     <description></description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-env.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-env.xml
index 8bb96fa..58db2f3 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-env.xml
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-env.xml
@@ -43,6 +43,7 @@
   </property>
   <property>
     <name>mapred_user</name>
+    <display-name>Mapreduce User</display-name>
     <value>mapred</value>
     <property-type>USER</property-type>
     <description>Mapreduce User</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml
index de0f31e..4becae6 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration/yarn-env.xml
@@ -43,6 +43,7 @@
   </property>
   <property>
     <name>yarn_user</name>
+    <display-name>Yarn User</display-name>
     <value>yarn</value>
     <property-type>USER</property-type>
     <description>YARN User</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
index e214bf8..83caac2 100644
--- a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
+++ b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
@@ -23,6 +23,7 @@
 <configuration>
   <property>
     <name>zk_user</name>
+    <display-name>ZooKeeper User</display-name>
     <value>zookeeper</value>
     <property-type>USER</property-type>
     <description>ZooKeeper User.</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/stacks/BIGTOP/0.8/configuration/cluster-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/configuration/cluster-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/configuration/cluster-env.xml
index d41ff98..ae3c6e9 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/configuration/cluster-env.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/configuration/cluster-env.xml
@@ -38,6 +38,7 @@
     </property>
     <property>
         <name>smokeuser</name>
+        <display-name>Smoke User</display-name>
         <value>ambari-qa</value>
         <property-type>USER</property-type>
         <description>User executing service checks</description>
@@ -49,6 +50,7 @@
     </property>
     <property>
         <name>user_group</name>
+        <display-name>User Group</display-name>
         <value>hadoop</value>
         <property-type>GROUP</property-type>
         <description>Hadoop user group.</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-env.xml
index 902b3ca..8bab91e 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-env.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/FLUME/configuration/flume-env.xml
@@ -33,6 +33,7 @@
   </property>
   <property>
     <name>flume_user</name>
+    <display-name>Flume User</display-name>
     <value>flume</value>
     <property-type>USER</property-type>
     <description>Flume User</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml
index fe2799c..b3a77ed 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/configuration/hbase-env.xml
@@ -57,6 +57,7 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
   </property>
    <property>
     <name>hbase_user</name>
+    <display-name>HBase User</display-name>
     <value>hbase</value>
     <property-type>USER</property-type>
     <description>HBase User Name.</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hadoop-env.xml
index 2737bf4..c32de4a 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hadoop-env.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/configuration/hadoop-env.xml
@@ -73,12 +73,14 @@
   </property>
   <property>
     <name>proxyuser_group</name>
+    <display-name>Proxy User Group</display-name>
     <value>users</value>
     <property-type>GROUP</property-type>
     <description>Proxy user group.</description>
   </property>
   <property>
     <name>hdfs_user</name>
+    <display-name>HDFS User</display-name>
     <value>hdfs</value>
     <property-type>USER</property-type>
     <description>User to run HDFS as</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-env.xml
index 1b8b75a..9612e7d 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-env.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-env.xml
@@ -60,6 +60,7 @@
   </property>
   <property>
     <name>hive_user</name>
+    <display-name>Hive User</display-name>
     <value>hive</value>
     <property-type>USER</property-type>
     <description>Hive User.</description>
@@ -79,12 +80,14 @@
   </property>
   <property>
     <name>hcat_user</name>
+    <display-name>HCat User</display-name>
     <value>hcat</value>
     <property-type>USER</property-type>
     <description>HCat User.</description>
   </property>
   <property>
     <name>webhcat_user</name>
+    <display-name>WebHCat User</display-name>
     <value>hcat</value>
     <property-type>USER</property-type>
     <description>WebHCat User.</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-env.xml
index 4f8c93a..78498d7 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-env.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-env.xml
@@ -23,6 +23,7 @@
 <configuration>
   <property>
     <name>oozie_user</name>
+    <display-name>Oozie User</display-name>
     <value>oozie</value>
     <property-type>USER</property-type>
     <description>Oozie User.</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration-mapred/mapred-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration-mapred/mapred-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration-mapred/mapred-env.xml
index 14ae20b..a725165 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration-mapred/mapred-env.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration-mapred/mapred-env.xml
@@ -33,6 +33,7 @@
   </property>
   <property>
     <name>mapred_user</name>
+    <display-name>Mapreduce User</display-name>
     <value>mapred</value>
     <property-type>USER</property-type>
     <description>Mapreduce User</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-env.xml
index 5730d4a..f391257 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-env.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/configuration/yarn-env.xml
@@ -33,6 +33,7 @@
   </property>
   <property>
     <name>yarn_user</name>
+    <display-name>Yarn User</display-name>
     <value>yarn</value>
     <property-type>USER</property-type>
     <description>YARN User</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-env.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-env.xml
index 4c305b0..11fbd1f 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-env.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/configuration/zookeeper-env.xml
@@ -23,6 +23,7 @@
 <configuration>
   <property>
     <name>zk_user</name>
+    <display-name>ZooKeeper User</display-name>
     <value>zookeeper</value>
     <property-type>USER</property-type>
     <description>ZooKeeper User.</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
index bce6b53..9cbcd59 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
@@ -58,11 +58,13 @@
   </property>
   <property>
     <name>proxyuser_group</name>
+    <display-name>Proxy User Group</display-name>
     <value>users</value>
     <description>Proxy user group.</description>
   </property>
   <property>
     <name>hdfs_user</name>
+    <display-name>HDFS User</display-name>
     <value>hdfs</value>
     <description>User to run HDFS as</description>
   </property>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-env.xml
index 60109c2..14b4e54 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/configuration/yarn-env.xml
@@ -33,6 +33,7 @@
   </property>
   <property>
     <name>yarn_user</name>
+    <display-name>Yarn User</display-name>
     <value>yarn</value>
     <description>YARN User</description>
   </property>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
index 3d2c3f2..98d43a5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/configuration/cluster-env.xml
@@ -43,6 +43,7 @@
     </property>
     <property>
         <name>smokeuser</name>
+        <display-name>Smoke User</display-name>
         <value>ambari-qa</value>
         <property-type>USER</property-type>
         <description>User executing service checks</description>
@@ -54,6 +55,7 @@
     </property>
     <property>
         <name>user_group</name>
+        <display-name>User Group</display-name>
         <value>hadoop</value>
         <property-type>GROUP</property-type>
         <description>Hadoop user group.</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/falcon-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/falcon-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/falcon-env.xml
index fadc02d..3b2bfc6 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/falcon-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/FALCON/configuration/falcon-env.xml
@@ -21,6 +21,7 @@
 <configuration supports_final="false">
   <property>
     <name>falcon_user</name>
+    <display-name>Falcon User</display-name>
     <value>falcon</value>
     <description>Falcon user.</description>
   </property>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
index 9644642..0c8fd0a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
@@ -84,11 +84,13 @@
   </property>
   <property>
     <name>proxyuser_group</name>
+    <display-name>Proxy User Group</display-name>
     <value>users</value>
     <description>Proxy user group.</description>
   </property>
   <property>
     <name>hdfs_user</name>
+    <display-name>HDFS User</display-name>
     <value>hdfs</value>
     <description>User to run HDFS as</description>
   </property>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/STORM/configuration/storm-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/STORM/configuration/storm-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/STORM/configuration/storm-env.xml
index fc65cfa..c8aa8b2 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/STORM/configuration/storm-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/STORM/configuration/storm-env.xml
@@ -23,6 +23,7 @@
 <configuration supports_final="false">
   <property>
     <name>storm_user</name>
+    <display-name>Storm User</display-name>
     <value>storm</value>
     <description></description>
   </property>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/TEZ/configuration/tez-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/TEZ/configuration/tez-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/TEZ/configuration/tez-env.xml
index 5ae9df1..9c0d4b9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/TEZ/configuration/tez-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/TEZ/configuration/tez-env.xml
@@ -23,6 +23,7 @@
 <configuration supports_final="false">
   <property>
     <name>tez_user</name>
+    <display-name>Tez User</display-name>
     <value>tez</value>
     <description></description>
   </property>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/yarn-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/yarn-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/yarn-env.xml
index 60109c2..14b4e54 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/yarn-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration/yarn-env.xml
@@ -33,6 +33,7 @@
   </property>
   <property>
     <name>yarn_user</name>
+    <display-name>Yarn User</display-name>
     <value>yarn</value>
     <description>YARN User</description>
   </property>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml
index a68295e..b985210 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-env.xml
@@ -62,6 +62,7 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
   </property>
   <property>
     <name>hbase_user</name>
+    <display-name>HBase User</display-name>
     <value>hbase</value>
     <property-type>USER</property-type>
     <description>HBase User Name.</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
index 1de50bd..b6ea298 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml
@@ -84,11 +84,13 @@
   </property>
   <property>
     <name>proxyuser_group</name>
+    <display-name>Proxy User Group</display-name>
     <value>users</value>
     <description>Proxy user group.</description>
   </property>
   <property>
     <name>hdfs_user</name>
+    <display-name>HDFS User</display-name>
     <value>hdfs</value>
     <description>User to run HDFS as</description>
   </property>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml
index 2c661d9..211795d 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml
@@ -65,6 +65,7 @@
   </property>
   <property>
     <name>smokeuser</name>
+    <display-name>Smoke User</display-name>
     <value>ambari-qa</value>
     <property-type>USER</property-type>
     <description>User executing service checks</description>
@@ -76,6 +77,7 @@
   </property>
   <property>
     <name>user_group</name>
+    <display-name>User Group</display-name>
     <value>hadoop</value>
     <property-type>GROUP</property-type>
     <description>Hadoop user group.</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/configuration/hadoop-env.xml
index b84e820..a074faf 100644
--- a/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/configuration/hadoop-env.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/configuration/hadoop-env.xml
@@ -68,6 +68,7 @@
   </property>
   <property>
     <name>proxyuser_group</name>
+    <display-name>Proxy User Group</display-name>
     <value>users</value>
     <description>Proxy user group.</description>
   </property>
@@ -83,6 +84,7 @@
   </property>
   <property>
     <name>hdfs_user</name>
+    <display-name>HDFS User</display-name>
     <value>hdfs</value>
     <description>User and Groups.</description>
   </property>
@@ -93,11 +95,13 @@
   </property>
   <property>
     <name>smokeuser</name>
+    <display-name>Smoke User</display-name>
     <value>ambari-qa</value>
     <description>User executing service checks</description>
   </property>
   <property>
     <name>user_group</name>
+    <display-name>User Group</display-name>
     <value>hadoop</value>
     <description>Proxy user group.</description>
   </property>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/test/resources/stacks/HDP/2.0.6.1/services/FLUME/configuration/flume-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.6.1/services/FLUME/configuration/flume-env.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.6.1/services/FLUME/configuration/flume-env.xml
index 7b11bde..33a2e93 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.6.1/services/FLUME/configuration/flume-env.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.6.1/services/FLUME/configuration/flume-env.xml
@@ -33,6 +33,7 @@
   </property>
   <property>
     <name>flume_user</name>
+    <display-name>Flume User</display-name>
     <value>flume</value>
     <property-type>USER</property-type>
     <description>Flume User</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-env.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-env.xml
index 7b11bde..33a2e93 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-env.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.6/services/FLUME/configuration/flume-env.xml
@@ -33,6 +33,7 @@
   </property>
   <property>
     <name>flume_user</name>
+    <display-name>Flume User</display-name>
     <value>flume</value>
     <property-type>USER</property-type>
     <description>Flume User</description>

http://git-wip-us.apache.org/repos/asf/ambari/blob/bb65cc04/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hadoop-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hadoop-env.xml
index b84e820..f094233 100644
--- a/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hadoop-env.xml
+++ b/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/HDFS/configuration/hadoop-env.xml
@@ -68,6 +68,7 @@
   </property>
   <property>
     <name>proxyuser_group</name>
+    <display-name>Proxy User Group</display-name>
     <value>users</value>
     <description>Proxy user group.</description>
   </property>
@@ -93,11 +94,13 @@
   </property>
   <property>
     <name>smokeuser</name>
+    <display-name>Smoke User</display-name>
     <value>ambari-qa</value>
     <description>User executing service checks</description>
   </property>
   <property>
     <name>user_group</name>
+    <display-name>User Group</display-name>
     <value>hadoop</value>
     <description>Proxy user group.</description>
   </property>