ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From srima...@apache.org
Subject [96/98] [abbrv] ambari git commit: Revert "AMBARI-16272. Ambari Upgrade shouldn't automatically add stack configs (dlysnichenko)" - failing tests.
Date Thu, 02 Jun 2016 05:49:45 GMT
http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/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 bc6601f..45cd9a7 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
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
 <!--
 /**
@@ -30,8 +29,6 @@
       <type>user</type>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>falcon_port</name>
@@ -41,8 +38,6 @@
     <value-attributes>
       <type>int</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>falcon_log_dir</name>
@@ -53,8 +48,6 @@
       <type>directory</type>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>falcon_pid_dir</name>
@@ -66,8 +59,6 @@
       <editable-only-at-install>true</editable-only-at-install>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>falcon_local_dir</name>
@@ -77,16 +68,12 @@
     <value-attributes>
       <type>directory</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>falcon_store_uri</name>
     <value>file:///hadoop/falcon/store</value>
     <display-name>Falcon store URI</display-name>
     <description>Directory where entity definitions are stored.</description>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <!--embeddedmq properties-->
   <property>
@@ -97,8 +84,6 @@
       <type>directory</type>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>falcon.embeddedmq</name>
@@ -107,8 +92,6 @@
     <value-attributes>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>falcon.emeddedmq.port</name>
@@ -117,8 +100,6 @@
     <value-attributes>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>falcon_apps_hdfs_dir</name>
@@ -131,9 +112,8 @@
       <overridable>false</overridable>
       <visible>false</visible>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <!-- falcon-env.sh -->
   <property>
     <name>content</name>
@@ -185,14 +165,10 @@ export FALCON_EXTRA_CLASS_PATH={{atlas_hook_cp}}${FALCON_EXTRA_CLASS_PATH}
     <value-attributes>
       <type>content</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>supports_hive_dr</name>
     <value>false</value>
     <description>Enable support of Falcon Hive DR</description>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-runtime.properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-runtime.properties.xml b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-runtime.properties.xml
index d5ea282..94c8755 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-runtime.properties.xml
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-runtime.properties.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
 <!--
 /**
@@ -23,36 +22,26 @@
   <property>
     <name>*.domain</name>
     <value>${falcon.app.type}</value>
-    <description/>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+    <description></description>
   </property>
   <property>
     <name>*.log.cleanup.frequency.minutes.retention</name>
     <value>hours(6)</value>
-    <description/>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+    <description></description>
   </property>
   <property>
     <name>*.log.cleanup.frequency.hours.retention</name>
     <value>minutes(1)</value>
-    <description/>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+    <description></description>
   </property>
   <property>
     <name>*.log.cleanup.frequency.days.retention</name>
     <value>days(7)</value>
-    <description/>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+    <description></description>
   </property>
   <property>
     <name>*.log.cleanup.frequency.months.retention</name>
     <value>months(3)</value>
-    <description/>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+    <description></description>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml
index ab7df83..431d963 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/falcon-startup.properties.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
 <!--
 /**
@@ -24,51 +23,37 @@
   <property>
     <name>*.workflow.engine.impl</name>
     <value>org.apache.falcon.workflow.engine.OozieWorkflowEngine</value>
-    <description/>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+    <description></description>
   </property>
   <property>
     <name>*.oozie.process.workflow.builder</name>
     <value>org.apache.falcon.workflow.OozieProcessWorkflowBuilder</value>
-    <description/>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+    <description></description>
   </property>
   <property>
     <name>*.oozie.feed.workflow.builder</name>
     <value>org.apache.falcon.workflow.OozieFeedWorkflowBuilder</value>
-    <description/>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+    <description></description>
   </property>
   <property>
     <name>*.SchedulableEntityManager.impl</name>
     <value>org.apache.falcon.resource.SchedulableEntityManager</value>
-    <description/>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+    <description></description>
   </property>
   <property>
     <name>*.ConfigSyncService.impl</name>
     <value>org.apache.falcon.resource.ConfigSyncService</value>
-    <description/>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+    <description></description>
   </property>
   <property>
     <name>*.ProcessInstanceManager.impl</name>
     <value>org.apache.falcon.resource.InstanceManager</value>
-    <description/>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+    <description></description>
   </property>
   <property>
     <name>*.catalog.service.impl</name>
     <value>org.apache.falcon.catalog.HiveCatalogService</value>
-    <description/>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+    <description></description>
   </property>
   <property>
     <name>*.application.services</name>
@@ -79,12 +64,10 @@
       org.apache.falcon.rerun.service.LateRunService,\
       org.apache.falcon.service.LogCleanupService
     </value>
-    <description/>
+    <description></description>
     <value-attributes>
       <type>multiLine</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>*.configstore.listeners</name>
@@ -93,182 +76,138 @@
       org.apache.falcon.group.FeedGroupMap,\
       org.apache.falcon.service.SharedLibraryHostingService
     </value>
-    <description/>
+    <description></description>
     <value-attributes>
       <type>multiLine</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>*.broker.impl.class</name>
     <value>org.apache.activemq.ActiveMQConnectionFactory</value>
-    <description/>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+    <description></description>
   </property>
   <property>
     <name>*.shared.libs</name>
     <value>activemq-core,ant,geronimo-j2ee-management,hadoop-distcp,jms,json-simple,oozie-client,spring-jms</value>
-    <description/>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+    <description></description>
   </property>
   <!--common properties-->
   <property>
     <name>*.domain</name>
     <value>${falcon.app.type}</value>
-    <description/>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+    <description></description>
   </property>
   <property>
     <name>*.config.store.uri</name>
     <value>file:///hadoop/falcon/store</value>
     <description>Location to store user entity configurations</description>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>*.system.lib.location</name>
     <value>${falcon.home}/server/webapp/${falcon.app.type}/WEB-INF/lib</value>
     <description>Location of libraries that is shipped to Hadoop</description>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>*.retry.recorder.path</name>
     <value>${falcon.log.dir}/retry</value>
-    <description/>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+    <description></description>
   </property>
   <property>
     <name>*.falcon.cleanup.service.frequency</name>
     <value>days(1)</value>
-    <description/>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+    <description></description>
   </property>
   <property>
     <name>*.broker.url</name>
     <value>tcp://localhost:61616</value>
     <property-type>DONT_ADD_ON_UPGRADE</property-type>
     <description>Default Active MQ url</description>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>*.broker.ttlInMins</name>
     <value>4320</value>
-    <description/>
+    <description></description>
     <value-attributes>
       <type>int</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>*.hive.shared.libs</name>
     <value>hive-exec,hive-metastore,hive-common,hive-service,hive-hcatalog-server-extensions,\
 hive-hcatalog-core,hive-jdbc,hive-webhcat-java-client</value>
-    <description/>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+    <description></description>
   </property>
   <property>
     <name>*.entity.topic</name>
     <value>FALCON.ENTITY.TOPIC</value>
-    <description/>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+    <description></description>
   </property>
   <property>
     <name>*.max.retry.failure.count</name>
     <value>1</value>
-    <description/>
+    <description></description>
     <value-attributes>
       <type>int</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>*.internal.queue.size</name>
     <value>1000</value>
-    <description/>
+    <description></description>
     <value-attributes>
       <type>int</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>*.falcon.graph.preserve.history</name>
     <value>false</value>
-    <description/>
+    <description></description>
     <value-attributes>
       <type>boolean</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <!--properties without default values-->
   <property>
     <name>*.falcon.http.authentication.cookie.domain</name>
     <value>EXAMPLE.COM</value>
-    <description/>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+    <description></description>
   </property>
   <property>
     <name>*.falcon.http.authentication.blacklisted.users</name>
-    <value/>
+    <value></value>
     <description>Comma separated list of black listed users</description>
     <value-attributes>
       <empty-value-valid>true</empty-value-valid>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <!--authentication properties-->
   <property>
     <name>*.falcon.authentication.type</name>
     <value>simple</value>
-    <description/>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+    <description></description>
   </property>
   <property>
     <name>*.falcon.http.authentication.type</name>
     <value>simple</value>
-    <description/>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+    <description></description>
   </property>
   <property>
     <name>*.falcon.http.authentication.token.validity</name>
     <value>36000</value>
-    <description/>
+    <description></description>
     <value-attributes>
       <type>int</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>*.falcon.http.authentication.signature.secret</name>
     <value>falcon</value>
-    <description/>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+    <description></description>
   </property>
   <property>
     <name>*.falcon.http.authentication.simple.anonymous.allowed</name>
     <value>true</value>
     <description>Indicates if anonymous requests are allowed when using 'simple' authentication</description>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>*.falcon.http.authentication.kerberos.name.rules</name>
@@ -277,7 +216,5 @@ hive-hcatalog-core,hive-jdbc,hive-webhcat-java-client</value>
     <value-attributes>
       <type>multiLine</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/oozie-site.xml b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/oozie-site.xml
index 6ac4e27..deeb999 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/oozie-site.xml
@@ -16,6 +16,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+
 <configuration supports_final="true">
   <property>
     <name>oozie.service.ELService.ext.functions.coord-job-submit-instances</name>
@@ -41,9 +42,8 @@
     <value-attributes>
       <type>custom</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>oozie.service.ELService.ext.functions.coord-action-create-inst</name>
     <value>
@@ -69,9 +69,8 @@
     <value-attributes>
       <type>custom</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>oozie.service.ELService.ext.functions.coord-action-create</name>
     <value>
@@ -97,9 +96,8 @@
     <value-attributes>
       <type>custom</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>oozie.service.ELService.ext.functions.coord-job-submit-data</name>
     <value>
@@ -126,9 +124,8 @@
     <value-attributes>
       <type>custom</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>oozie.service.ELService.ext.functions.coord-action-start</name>
     <value>
@@ -157,9 +154,8 @@
     <value-attributes>
       <type>custom</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>oozie.service.ELService.ext.functions.coord-sla-submit</name>
     <value>
@@ -172,9 +168,8 @@
     <value-attributes>
       <type>custom</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>oozie.service.ELService.ext.functions.coord-sla-create</name>
     <value>
@@ -187,9 +182,8 @@
     <value-attributes>
       <type>custom</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+  
   <property>
     <name>oozie.service.HadoopAccessorService.supported.filesystems</name>
     <value>*</value>
@@ -199,18 +193,18 @@
     <value-attributes>
       <type>custom</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+  
   <!--web ui should add following properties to oozie site accordingly to FALCON_USER-->
   <!--<property>-->
-  <!--<name>oozie.service.ProxyUserService.proxyuser.#FALCON_USER#.hosts</name>-->
-  <!--<value>*</value>-->
-  <!--<description>Falcon proxyuser hosts</description>-->
+    <!--<name>oozie.service.ProxyUserService.proxyuser.#FALCON_USER#.hosts</name>-->
+    <!--<value>*</value>-->
+    <!--<description>Falcon proxyuser hosts</description>-->
   <!--</property>-->
+
   <!--<property>-->
-  <!--<name>oozie.service.ProxyUserService.proxyuser.#FALCON_USER#.groups</name>-->
-  <!--<value>*</value>-->
-  <!--<description>Falcon proxyuser groups</description>-->
+    <!--<name>oozie.service.ProxyUserService.proxyuser.#FALCON_USER#.groups</name>-->
+    <!--<value>*</value>-->
+    <!--<description>Falcon proxyuser groups</description>-->
   <!--</property>-->
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-conf.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-conf.xml b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-conf.xml
index c55f499..7fb2986 100644
--- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-conf.xml
+++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/configuration/flume-conf.xml
@@ -19,6 +19,7 @@
  * limitations under the License.
  */
 -->
+
 <configuration supports_final="false" supports_adding_forbidden="true">
   <property>
     <name>content</name>
@@ -34,7 +35,5 @@
       <empty-value-valid>true</empty-value-valid>
       <show-property-name>false</show-property-name>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/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 df9a75d..3585f44 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
@@ -19,6 +19,7 @@
  * limitations under the License.
  */
 -->
+
 <configuration supports_adding_forbidden="true">
   <property>
     <name>flume_conf_dir</name>
@@ -30,8 +31,6 @@
       <overridable>false</overridable>
       <editable-only-at-install>true</editable-only-at-install>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>flume_log_dir</name>
@@ -42,15 +41,11 @@
       <type>directory</type>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>flume_run_dir</name>
     <value>/var/run/flume</value>
     <description>Location to save information about running agents</description>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>flume_user</name>
@@ -62,9 +57,8 @@
       <type>user</type>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <!-- flume-env.sh -->
   <property>
     <name>content</name>
@@ -105,8 +99,6 @@ fi
 export HIVE_HOME={{flume_hive_home}}
 export HCAT_HOME={{flume_hcat_home}}
     </value>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <value-attributes>
     <type>content</type>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/configuration/ganglia-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/configuration/ganglia-env.xml b/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/configuration/ganglia-env.xml
index b1524a0..e0f1ebe 100644
--- a/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/configuration/ganglia-env.xml
+++ b/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/configuration/ganglia-env.xml
@@ -19,77 +19,59 @@
  * limitations under the License.
  */
 -->
+
 <configuration supports_adding_forbidden="true">
   <property>
     <name>ganglia_conf_dir</name>
     <value>/etc/ganglia/hdp</value>
     <description>Config directory for Ganglia</description>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>ganglia_runtime_dir</name>
     <value>/var/run/ganglia/hdp</value>
     <description>Run directories for Ganglia</description>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>gmetad_user</name>
     <value>nobody</value>
     <property-type>USER GROUP</property-type>
     <description>User </description>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
-  <property>
+    <property>
     <name>gmond_user</name>
     <value>nobody</value>
     <property-type>USER GROUP</property-type>
     <description>User </description>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>rrdcached_base_dir</name>
     <value>/var/lib/ganglia/rrds</value>
     <description>Default directory for saving the rrd files on ganglia server</description>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>rrdcached_timeout</name>
     <value>3600</value>
     <description>(-w) Data is written to disk every timeout seconds. If this option is not specified the default interval of 300 seconds will be used.</description>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>rrdcached_flush_timeout</name>
     <value>7200</value>
-    <description>(-f) Every timeout seconds the entire cache is searched for old values which are written to disk. This only concerns files to which updates have stopped, so setting this to a high value, such as 3600 seconds, is acceptable in most cases. This timeout defaults to 3600 seconds.</description>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+      <description>(-f) Every timeout seconds the entire cache is searched for old values which are written to disk. This only concerns files to which updates have stopped, so setting this to a high value, such as 3600 seconds, is acceptable in most cases. This timeout defaults to 3600 seconds.</description>
   </property>
   <property>
     <name>rrdcached_delay</name>
     <value>1800</value>
     <description>(-z) If specified, rrdcached will delay writing of each RRD for a random number of seconds in the range [0,delay). This will avoid too many writes being queued simultaneously. This value should be no greater than the value specified in -w. By default, there is no delay.</description>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>rrdcached_write_threads</name>
     <value>4</value>
     <description>(-t) Specifies the number of threads used for writing RRD files. The default is 4. Increasing this number will allow rrdcached to have more simultaneous I/O requests into the kernel. This may allow the kernel to re-order disk writes, resulting in better disk throughput.</description>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>additional_clusters</name>
     <value> </value>
     <description>Add additional desired Ganglia metrics cluster in the form "name1:port1,name2:port2". Ensure that the names and ports are unique across all cluster and ports are available on ganglia server host. Ambari has reserved ports 8667-8669 within its own pool.</description>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-check-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-check-env.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-check-env.xml
index 27f6fcc..8cce4b7 100755
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-check-env.xml
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-check-env.xml
@@ -18,15 +18,15 @@
 -->
 <configuration supports_adding_forbidden="true">
   <!-- hawq_check.cnf -->
-  <property>
-    <name>content</name>
-    <display-name>Content</display-name>
-    <description>
+    <property>
+      <name>content</name>
+      <display-name>Content</display-name>
+      <description>
         Contents of the configuration file /usr/local/hawq/etc/hawq_check.cnf.
         This file is used by 'hawq check' command, which can be run manually by gpadmin user on the HAWQ master host.
         This command validates the system parameters and HDFS parameters mentioned in this file to ensure optimal HAWQ operation.
       </description>
-    <value>
+        <value>
 [global]
 configfile_version = 4
 
@@ -89,7 +89,5 @@ dfs.namenode.accesstime.precision = -1
       <type>content</type>
       <show-property-name>false</show-property-name>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-env.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-env.xml
index 2521ade..d96f02f 100644
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-env.xml
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-env.xml
@@ -16,11 +16,12 @@
    limitations under the License.
 -->
 <configuration supports_adding_forbidden="true">
+
   <property require-input="true">
     <name>hawq_password</name>
     <property-type>PASSWORD</property-type>
     <display-name>HAWQ System User Password</display-name>
-    <value/>
+    <value></value>
     <description>
       Sets the HAWQ system user (gpadmin) password. This password is used for ssh key exchange when initializing a cluster or provisioning a new host.
       Set when the HAWQ system user is created.
@@ -29,9 +30,8 @@
     <value-attributes>
       <type>password</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>hawq_ssh_exkeys</name>
     <display-name>Exchange SSH Keys</display-name>
@@ -45,7 +45,6 @@
     <value-attributes>
       <type>boolean</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-limits-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-limits-env.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-limits-env.xml
index 6636420..341c1c1 100644
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-limits-env.xml
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-limits-env.xml
@@ -16,6 +16,7 @@
    limitations under the License.
 -->
 <configuration supports_adding_forbidden="true">
+
   <property>
     <display-name>soft nofile</display-name>
     <name>soft_nofile</name>
@@ -28,9 +29,8 @@
       <type>int</type>
       <minimum>0</minimum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <display-name>hard nofile</display-name>
     <name>hard_nofile</name>
@@ -43,9 +43,8 @@
       <type>int</type>
       <minimum>0</minimum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <display-name>soft nproc</display-name>
     <name>soft_nproc</name>
@@ -58,9 +57,8 @@
       <type>int</type>
       <minimum>0</minimum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <display-name>hard nproc</display-name>
     <name>hard_nproc</name>
@@ -73,7 +71,6 @@
       <type>int</type>
       <minimum>0</minimum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
index 2772bef..f72fce8 100644
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
@@ -16,6 +16,7 @@
    limitations under the License.
 -->
 <configuration>
+
   <property>
     <name>hawq_master_address_host</name>
     <display-name>HAWQ Master</display-name>
@@ -26,9 +27,8 @@
     <value-attributes>
       <type>componentHost</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>hawq_master_address_port</name>
     <display-name>HAWQ Master Port</display-name>
@@ -41,9 +41,8 @@
       <type>int</type>
       <minimum>0</minimum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>hawq_standby_address_host</name>
     <display-name>HAWQ Standby Master</display-name>
@@ -54,9 +53,8 @@
     <value-attributes>
       <type>componentHost</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>hawq_segment_address_port</name>
     <display-name>HAWQ Segment Port</display-name>
@@ -69,9 +67,8 @@
       <type>int</type>
       <minimum>0</minimum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>hawq_dfs_url</name>
     <display-name>HAWQ DFS URL</display-name>
@@ -84,9 +81,8 @@
       <overridable>false</overridable>
       <editable-only-at-install>true</editable-only-at-install>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>hawq_master_directory</name>
     <display-name>HAWQ Master Directory</display-name>
@@ -100,9 +96,8 @@
       <overridable>false</overridable>
       <editable-only-at-install>true</editable-only-at-install>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>hawq_segment_directory</name>
     <display-name>HAWQ Segment Directory</display-name>
@@ -116,9 +111,8 @@
       <overridable>false</overridable>
       <editable-only-at-install>true</editable-only-at-install>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>hawq_master_temp_directory</name>
     <display-name>HAWQ Master Temp Directories</display-name>
@@ -131,9 +125,8 @@
     <value-attributes>
       <type>directory</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>hawq_segment_temp_directory</name>
     <display-name>HAWQ Segment Temp Directories</display-name>
@@ -146,9 +139,8 @@
     <value-attributes>
       <type>directory</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <!-- HAWQ resource manager parameters -->
   <property>
     <name>hawq_global_rm_type</name>
@@ -174,9 +166,8 @@
       </entries>
       <selection-cardinality>1</selection-cardinality>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>hawq_rm_memory_limit_perseg</name>
     <display-name>Segment Memory Usage Limit</display-name>
@@ -198,9 +189,8 @@
     <value-attributes>
       <type>string</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>hawq_rm_nvcore_limit_perseg</name>
     <display-name>Segment Virtual Core Usage Limit</display-name>
@@ -221,9 +211,8 @@
       <maximum>64</maximum>
       <increment-step>4</increment-step>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>hawq_rm_yarn_address</name>
     <value>localhost:8032</value>
@@ -242,9 +231,8 @@
       <type>string</type>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>hawq_rm_yarn_scheduler_address</name>
     <value>localhost:8030</value>
@@ -263,9 +251,8 @@
       <type>string</type>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>hawq_rm_yarn_queue_name</name>
     <value>default</value>
@@ -276,9 +263,8 @@
     <value-attributes>
       <type>string</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>hawq_rm_yarn_app_name</name>
     <value>hawq</value>
@@ -289,9 +275,8 @@
     <value-attributes>
       <type>string</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>default_hash_table_bucket_number</name>
     <display-name>Default buckets for Hash Distributed tables</display-name>
@@ -308,10 +293,9 @@
       <maximum>10000</maximum>
       <increment-step>100</increment-step>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
-  <property>
+
+    <property>
     <name>hawq_rm_nvseg_perquery_perseg_limit</name>
     <display-name>Virtual Segments Limit per Query (per Segment Node)</display-name>
     <value>6</value>
@@ -324,12 +308,11 @@
       <type>int</type>
       <minimum>1</minimum>
       <maximum>16</maximum>
-      <increment-step>1</increment-step>
+       <increment-step>1</increment-step>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
-  <property>
+
+   <property>
     <name>hawq_rm_nvseg_perquery_limit</name>
     <display-name>Virtual Segments Limit per Query (Total)</display-name>
     <value>512</value>
@@ -342,9 +325,8 @@
       <type>int</type>
       <minimum>1</minimum>
       <maximum>10000</maximum>
-      <increment-step>100</increment-step>
+       <increment-step>100</increment-step>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-sysctl-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-sysctl-env.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-sysctl-env.xml
index 271f1ba..60ae8db 100644
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-sysctl-env.xml
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-sysctl-env.xml
@@ -27,9 +27,8 @@
       <type>int</type>
       <minimum>0</minimum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>kernel.shmmni</name>
     <value>4096</value>
@@ -41,9 +40,8 @@
       <type>int</type>
       <minimum>0</minimum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>kernel.shmall</name>
     <value>4000000000</value>
@@ -55,9 +53,8 @@
       <type>int</type>
       <minimum>0</minimum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>kernel.sem</name>
     <value>250 512000 100 2048</value>
@@ -68,9 +65,8 @@
     <value-attributes>
       <type>string</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>kernel.sysrq</name>
     <value>1</value>
@@ -84,9 +80,8 @@
       <minimum>0</minimum>
       <maximum>1</maximum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>kernel.core_uses_pid</name>
     <value>1</value>
@@ -100,9 +95,8 @@
       <minimum>0</minimum>
       <maximum>1</maximum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>kernel.msgmnb</name>
     <value>65536</value>
@@ -114,9 +108,8 @@
       <type>int</type>
       <minimum>0</minimum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>kernel.msgmax</name>
     <value>65536</value>
@@ -128,9 +121,8 @@
       <type>int</type>
       <minimum>0</minimum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>kernel.msgmni</name>
     <value>2048</value>
@@ -142,9 +134,8 @@
       <type>int</type>
       <minimum>0</minimum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>net.ipv4.tcp_syncookies</name>
     <value>0</value>
@@ -158,9 +149,8 @@
       <minimum>0</minimum>
       <maximum>1</maximum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>net.ipv4.ip_forward</name>
     <value>0</value>
@@ -174,9 +164,8 @@
       <minimum>0</minimum>
       <maximum>1</maximum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>net.ipv4.conf.default.accept_source_route</name>
     <value>0</value>
@@ -190,9 +179,8 @@
       <minimum>0</minimum>
       <maximum>1</maximum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>net.ipv4.tcp_tw_recycle</name>
     <value>1</value>
@@ -206,9 +194,8 @@
       <minimum>0</minimum>
       <maximum>1</maximum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>net.ipv4.tcp_max_syn_backlog</name>
     <value>200000</value>
@@ -220,9 +207,8 @@
       <type>int</type>
       <minimum>0</minimum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>net.ipv4.conf.all.arp_filter</name>
     <value>1</value>
@@ -236,9 +222,8 @@
       <minimum>0</minimum>
       <maximum>1</maximum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>net.ipv4.ip_local_port_range</name>
     <value>1025 65535</value>
@@ -249,9 +234,8 @@
     <value-attributes>
       <type>string</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>net.core.netdev_max_backlog</name>
     <value>200000</value>
@@ -263,9 +247,8 @@
       <type>int</type>
       <minimum>0</minimum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>fs.nr_open</name>
     <value>3000000</value>
@@ -277,9 +260,8 @@
       <type>int</type>
       <minimum>0</minimum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>kernel.threads-max</name>
     <value>798720</value>
@@ -291,9 +273,8 @@
       <type>int</type>
       <minimum>0</minimum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>kernel.pid_max</name>
     <value>798720</value>
@@ -305,9 +286,8 @@
       <type>int</type>
       <minimum>0</minimum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>net.core.rmem_max</name>
     <value>2097152</value>
@@ -319,9 +299,8 @@
       <type>int</type>
       <minimum>0</minimum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>net.core.wmem_max</name>
     <value>2097152</value>
@@ -333,9 +312,8 @@
       <type>int</type>
       <minimum>0</minimum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>vm.overcommit_memory</name>
     <display-name>VM Overcommit</display-name>
@@ -354,9 +332,8 @@
       <maximum>2</maximum>
       <increment-step>1</increment-step>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>vm.overcommit_ratio</name>
     <display-name>VM Overcommit Ratio</display-name>
@@ -368,7 +345,6 @@
     <value-attributes>
       <type>int</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hdfs-client.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hdfs-client.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hdfs-client.xml
index 2a22e60..ab72f48 100644
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hdfs-client.xml
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hdfs-client.xml
@@ -15,7 +15,9 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
+
 <configuration>
+
   <property>
     <name>rpc.client.timeout</name>
     <value>3600000</value>
@@ -28,9 +30,8 @@
       <minimum>0</minimum>
       <unit>milliseconds</unit>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>rpc.client.connect.tcpnodelay</name>
     <value>true</value>
@@ -41,9 +42,8 @@
     <value-attributes>
       <type>boolean</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>rpc.client.max.idle</name>
     <value>10000</value>
@@ -56,9 +56,8 @@
       <minimum>0</minimum>
       <unit>milliseconds</unit>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>rpc.client.ping.interval</name>
     <value>10000</value>
@@ -71,9 +70,8 @@
       <minimum>0</minimum>
       <unit>milliseconds</unit>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>rpc.client.connect.timeout</name>
     <value>600000</value>
@@ -86,9 +84,8 @@
       <minimum>0</minimum>
       <unit>milliseconds</unit>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>rpc.client.connect.retry</name>
     <value>10</value>
@@ -100,9 +97,8 @@
       <type>int</type>
       <minimum>0</minimum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>rpc.client.read.timeout</name>
     <value>3600000</value>
@@ -115,9 +111,8 @@
       <minimum>0</minimum>
       <unit>milliseconds</unit>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>rpc.client.write.timeout</name>
     <value>3600000</value>
@@ -130,9 +125,8 @@
       <minimum>0</minimum>
       <unit>milliseconds</unit>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>rpc.client.socket.linger.timeout</name>
     <value>-1</value>
@@ -143,9 +137,8 @@
     <value-attributes>
       <type>int</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>dfs.client.read.shortcircuit</name>
     <value>true</value>
@@ -156,9 +149,8 @@
     <value-attributes>
       <type>boolean</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>dfs.default.replica</name>
     <value>3</value>
@@ -169,10 +161,9 @@
     <value-attributes>
       <type>int</type>
       <minimum>0</minimum>
-    </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+  	</value-attributes>
   </property>
+
   <property>
     <name>dfs.prefetchsize</name>
     <value>10</value>
@@ -184,9 +175,8 @@
       <type>int</type>
       <minimum>0</minimum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>dfs.client.failover.max.attempts</name>
     <value>15</value>
@@ -197,10 +187,9 @@
     <value-attributes>
       <type>int</type>
       <minimum>0</minimum>
-    </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+  	</value-attributes>
   </property>
+
   <property>
     <name>dfs.default.blocksize</name>
     <value>134217728</value>
@@ -208,14 +197,13 @@
       The default block size in bytes.
       The default value is 134217728 (128 MB).
     </description>
-    <value-attributes>
+  	<value-attributes>
       <type>int</type>
       <minimum>0</minimum>
       <unit>bytes</unit>
-    </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+  	</value-attributes>
   </property>
+
   <property>
     <name>dfs.client.log.severity</name>
     <value>INFO</value>
@@ -247,9 +235,8 @@
       </entries>
       <selection-cardinality>1</selection-cardinality>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>input.connect.timeout</name>
     <value>600000</value>
@@ -262,9 +249,8 @@
       <minimum>0</minimum>
       <unit>milliseconds</unit>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>input.read.timeout</name>
     <value>3600000</value>
@@ -277,9 +263,8 @@
       <minimum>0</minimum>
       <unit>milliseconds</unit>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>input.write.timeout</name>
     <value>3600000</value>
@@ -292,9 +277,8 @@
       <minimum>0</minimum>
       <unit>milliseconds</unit>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>input.localread.default.buffersize</name>
     <value>2097152</value>
@@ -307,10 +291,9 @@
       <type>int</type>
       <minimum>0</minimum>
       <unit>bytes</unit>
-    </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+  	</value-attributes>
   </property>
+
   <property>
     <name>input.localread.blockinfo.cachesize</name>
     <value>1000</value>
@@ -322,10 +305,9 @@
       <type>int</type>
       <minimum>0</minimum>
       <unit>bytes</unit>
-    </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+  	</value-attributes>
   </property>
+
   <property>
     <name>input.read.getblockinfo.retry</name>
     <value>3</value>
@@ -337,9 +319,8 @@
       <type>int</type>
       <minimum>0</minimum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>output.replace-datanode-on-failure</name>
     <value>true</value>
@@ -351,9 +332,8 @@
     <value-attributes>
       <type>boolean</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>output.default.chunksize</name>
     <value>512</value>
@@ -365,10 +345,9 @@
       <type>int</type>
       <minimum>0</minimum>
       <unit>bytes</unit>
-    </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+  	</value-attributes>
   </property>
+
   <property>
     <name>output.default.packetsize</name>
     <value>65536</value>
@@ -380,10 +359,9 @@
       <type>int</type>
       <minimum>0</minimum>
       <unit>bytes</unit>
-    </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+  	</value-attributes>
   </property>
+
   <property>
     <name>output.default.write.retry</name>
     <value>10</value>
@@ -395,9 +373,8 @@
       <type>int</type>
       <minimum>0</minimum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>output.connect.timeout</name>
     <value>600000</value>
@@ -410,9 +387,8 @@
       <minimum>0</minimum>
       <unit>milliseconds</unit>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>output.read.timeout</name>
     <value>3600000</value>
@@ -425,9 +401,8 @@
       <minimum>0</minimum>
       <unit>milliseconds</unit>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>output.write.timeout</name>
     <value>3600000</value>
@@ -440,9 +415,8 @@
       <minimum>0</minimum>
       <unit>milliseconds</unit>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>output.packetpool.size</name>
     <value>1024</value>
@@ -454,10 +428,9 @@
       <type>int</type>
       <minimum>0</minimum>
       <unit>bytes</unit>
-    </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
+  	</value-attributes>
   </property>
+
   <property>
     <name>output.close.timeout</name>
     <value>900000</value>
@@ -470,9 +443,8 @@
       <minimum>0</minimum>
       <unit>milliseconds</unit>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>dfs.domain.socket.path</name>
     <value>/var/lib/hadoop-hdfs/dn_socket</value>
@@ -483,9 +455,8 @@
     <value-attributes>
       <type>directory</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>dfs.client.use.legacy.blockreader.local</name>
     <value>false</value>
@@ -497,7 +468,6 @@
     <value-attributes>
       <type>boolean</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
-</configuration>
+
+</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/yarn-client.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/yarn-client.xml b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/yarn-client.xml
index bc3c4ba..6372392 100755
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/yarn-client.xml
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/yarn-client.xml
@@ -15,8 +15,10 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
+
 <configuration>
-  <!-- RPC client configuration -->
+
+	<!-- RPC client configuration -->
   <property>
     <name>rpc.client.timeout</name>
     <value>3600000</value>
@@ -29,9 +31,8 @@
       <minimum>0</minimum>
       <unit>milliseconds</unit>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>rpc.client.connect.tcpnodelay</name>
     <value>true</value>
@@ -42,9 +43,8 @@
     <value-attributes>
       <type>boolean</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>rpc.client.max.idle</name>
     <value>10000</value>
@@ -56,9 +56,8 @@
       <minimum>0</minimum>
       <unit>milliseconds</unit>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>rpc.client.ping.interval</name>
     <value>10000</value>
@@ -71,9 +70,8 @@
       <minimum>0</minimum>
       <unit>milliseconds</unit>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>rpc.client.connect.timeout</name>
     <value>600000</value>
@@ -86,9 +84,8 @@
       <minimum>0</minimum>
       <unit>milliseconds</unit>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>rpc.client.connect.retry</name>
     <value>10</value>
@@ -100,9 +97,8 @@
       <type>int</type>
       <minimum>0</minimum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>rpc.client.read.timeout</name>
     <value>3600000</value>
@@ -115,9 +111,8 @@
       <minimum>0</minimum>
       <unit>milliseconds</unit>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>rpc.client.write.timeout</name>
     <value>3600000</value>
@@ -130,9 +125,8 @@
       <minimum>0</minimum>
       <unit>milliseconds</unit>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>rpc.client.socket.linger.timeout</name>
     <value>-1</value>
@@ -145,9 +139,8 @@
       <minimum>0</minimum>
       <unit>milliseconds</unit>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>yarn.client.failover.max.attempts</name>
     <value>15</value>
@@ -159,7 +152,6 @@
       <type>int</type>
       <minimum>0</minimum>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
-</configuration>
+
+</configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/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 417e31b..61579e2 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
@@ -19,6 +19,7 @@
  * limitations under the License.
  */
 -->
+
 <configuration supports_adding_forbidden="true">
   <property>
     <name>hbase_log_dir</name>
@@ -29,8 +30,6 @@
       <type>directory</type>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>hbase_pid_dir</name>
@@ -42,8 +41,6 @@
       <overridable>false</overridable>
       <editable-only-at-install>true</editable-only-at-install>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>hbase_regionserver_heapsize</name>
@@ -57,8 +54,6 @@
       <unit>MB</unit>
       <increment-step>256</increment-step>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>hbase_regionserver_xmn_max</name>
@@ -73,8 +68,6 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
       <type>int</type>
       <unit>MB</unit>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>hbase_regionserver_xmn_ratio</name>
@@ -84,8 +77,6 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
     <value-attributes>
       <type>float</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>hbase_master_heapsize</name>
@@ -99,8 +90,6 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
       <unit>MB</unit>
       <increment-step>256</increment-step>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>hbase_user</name>
@@ -112,23 +101,18 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
       <type>user</type>
       <overridable>false</overridable>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>hbase_user_nofile_limit</name>
     <value>32000</value>
     <description>Max open files limit setting for HBASE user.</description>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
   <property>
     <name>hbase_user_nproc_limit</name>
     <value>16000</value>
     <description>Max number of processes limit setting for HBASE user.</description>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>hbase_java_io_tmpdir</name>
     <value>/tmp</value>
@@ -136,21 +120,18 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value.
     <value-attributes>
       <type>directory</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>hbase_principal_name</name>
     <description>HBase principal name</description>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>hbase_user_keytab</name>
     <description>HBase keytab path</description>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <!-- hbase-env.sh -->
   <property>
     <name>content</name>
@@ -227,7 +208,7 @@ export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -Xmn{{regionserver_xmn_
     <value-attributes>
       <type>content</type>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
+
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-log4j.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-log4j.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-log4j.xml
index 61d9d4c..4c76de6 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-log4j.xml
@@ -19,7 +19,9 @@
  * limitations under the License.
  */
 -->
+
 <configuration supports_final="false" supports_adding_forbidden="true">
+
   <property>
     <name>content</name>
     <display-name>hbase-log4j template</display-name>
@@ -141,7 +143,6 @@ log4j.logger.org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher=INFO
       <type>content</type>
       <show-property-name>false</show-property-name>
     </value-attributes>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/3148759f/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-policy.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-policy.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-policy.xml
index 163e95e..2f12801 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-policy.xml
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-policy.xml
@@ -19,6 +19,7 @@
  * limitations under the License.
  */
 -->
+
 <configuration supports_final="true">
   <property>
     <name>security.client.protocol.acl</name>
@@ -28,9 +29,8 @@
     The ACL is a comma-separated list of user and group names. The user and 
     group list is separated by a blank. For e.g. "alice,bob users,wheel". 
     A special value of "*" means all users are allowed.</description>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>security.admin.protocol.acl</name>
     <value>*</value>
@@ -39,9 +39,8 @@
     The ACL is a comma-separated list of user and group names. The user and 
     group list is separated by a blank. For e.g. "alice,bob users,wheel". 
     A special value of "*" means all users are allowed.</description>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
+
   <property>
     <name>security.masterregion.protocol.acl</name>
     <value>*</value>
@@ -50,7 +49,5 @@
     The ACL is a comma-separated list of user and group names. The user and 
     group list is separated by a blank. For e.g. "alice,bob users,wheel". 
     A special value of "*" means all users are allowed.</description>
-    <on-ambari-upgrade add="true" change="false" delete="false"/>
-    <on-stack-upgrade add="true" change="false" delete="false"/>
   </property>
 </configuration>


Mime
View raw message