HADOOP-14804. correct wrong parameters format order in core-default.xml. Contributed by Chen Hongfei.

hadoop-common-project/hadoop-common/src/main/resources/core-default.xml

@@ -1973,38 +1973,38 @@
 
 <!-- HTTP CORS support -->
 <property>
-  <description>Enable/disable the cross-origin (CORS) filter.</description>
   <name>hadoop.http.cross-origin.enabled</name>
   <value>false</value>
+  <description>Enable/disable the cross-origin (CORS) filter.</description>
 </property>
 
 <property>
+  <name>hadoop.http.cross-origin.allowed-origins</name>
+  <value>*</value>
   <description>Comma separated list of origins that are allowed for web
     services needing cross-origin (CORS) support. Wildcards (*) and patterns
     allowed</description>
-  <name>hadoop.http.cross-origin.allowed-origins</name>
-  <value>*</value>
 </property>
 
 <property>
-  <description>Comma separated list of methods that are allowed for web
-    services needing cross-origin (CORS) support.</description>
   <name>hadoop.http.cross-origin.allowed-methods</name>
   <value>GET,POST,HEAD</value>
+  <description>Comma separated list of methods that are allowed for web
+    services needing cross-origin (CORS) support.</description>
 </property>
 
 <property>
-  <description>Comma separated list of headers that are allowed for web
-    services needing cross-origin (CORS) support.</description>
   <name>hadoop.http.cross-origin.allowed-headers</name>
   <value>X-Requested-With,Content-Type,Accept,Origin</value>
+  <description>Comma separated list of headers that are allowed for web
+    services needing cross-origin (CORS) support.</description>
 </property>
 
 <property>
-  <description>The number of seconds a pre-flighted request can be cached
-    for web services needing cross-origin (CORS) support.</description>
   <name>hadoop.http.cross-origin.max-age</name>
   <value>1800</value>
+  <description>The number of seconds a pre-flighted request can be cached
+    for web services needing cross-origin (CORS) support.</description>
 </property>
 
 <property>
@@ -2095,13 +2095,13 @@
 
 <!-- Static Web User Filter properties. -->
 <property>
+  <name>hadoop.http.staticuser.user</name>
+  <value>dr.who</value>
   <description>
     The user name to filter as, on static web filters
     while rendering content. An example use is the HDFS
     web UI (user to be used for browsing files).
   </description>
-  <name>hadoop.http.staticuser.user</name>
-  <value>dr.who</value>
 </property>
 
 <!-- SSLFactory configuration -->
@@ -2464,6 +2464,8 @@
   <!-- YARN registry -->
 
   <property>
+    <name>hadoop.registry.rm.enabled</name>
+    <value>false</value>
     <description>
       Is the registry enabled in the YARN Resource Manager?
 
@@ -2475,50 +2477,50 @@
       If false, the paths must be created by other means,
       and no automatic cleanup of service records will take place.
     </description>
-    <name>hadoop.registry.rm.enabled</name>
-    <value>false</value>
   </property>
 
   <property>
+    <name>hadoop.registry.zk.root</name>
+    <value>/registry</value>
     <description>
       The root zookeeper node for the registry
     </description>
-    <name>hadoop.registry.zk.root</name>
-    <value>/registry</value>
   </property>
 
   <property>
+    <name>hadoop.registry.zk.session.timeout.ms</name>
+    <value>60000</value>
     <description>
       Zookeeper session timeout in milliseconds
     </description>
-    <name>hadoop.registry.zk.session.timeout.ms</name>
-    <value>60000</value>
   </property>
 
   <property>
+    <name>hadoop.registry.zk.connection.timeout.ms</name>
+    <value>15000</value>
     <description>
       Zookeeper connection timeout in milliseconds
     </description>
-    <name>hadoop.registry.zk.connection.timeout.ms</name>
-    <value>15000</value>
   </property>
 
   <property>
+    <name>hadoop.registry.zk.retry.times</name>
+    <value>5</value>
     <description>
       Zookeeper connection retry count before failing
     </description>
-    <name>hadoop.registry.zk.retry.times</name>
-    <value>5</value>
   </property>
 
   <property>
-    <description>
-    </description>
     <name>hadoop.registry.zk.retry.interval.ms</name>
     <value>1000</value>
+    <description>
+    </description>
   </property>
 
   <property>
+    <name>hadoop.registry.zk.retry.ceiling.ms</name>
+    <value>60000</value>
     <description>
       Zookeeper retry limit in milliseconds, during
       exponential backoff.
@@ -2528,20 +2530,20 @@
       with the backoff policy, result in a long retry
       period
     </description>
-    <name>hadoop.registry.zk.retry.ceiling.ms</name>
-    <value>60000</value>
   </property>
 
   <property>
+    <name>hadoop.registry.zk.quorum</name>
+    <value>localhost:2181</value>
     <description>
       List of hostname:port pairs defining the
       zookeeper quorum binding for the registry
     </description>
-    <name>hadoop.registry.zk.quorum</name>
-    <value>localhost:2181</value>
   </property>
 
   <property>
+    <name>hadoop.registry.secure</name>
+    <value>false</value>
     <description>
       Key to set if the registry is secure. Turning it on
       changes the permissions policy from "open access"
@@ -2549,11 +2551,11 @@
       a user adding one or more auth key pairs down their
       own tree.
     </description>
-    <name>hadoop.registry.secure</name>
-    <value>false</value>
   </property>
 
   <property>
+    <name>hadoop.registry.system.acls</name>
+    <value>sasl:yarn@, sasl:mapred@, sasl:hdfs@</value>
     <description>
       A comma separated list of Zookeeper ACL identifiers with
       system access to the registry in a secure cluster.
@@ -2563,11 +2565,11 @@
       If there is an "@" at the end of a SASL entry it
       instructs the registry client to append the default kerberos domain.
     </description>
-    <name>hadoop.registry.system.acls</name>
-    <value>sasl:yarn@, sasl:mapred@, sasl:hdfs@</value>
   </property>
 
   <property>
+    <name>hadoop.registry.kerberos.realm</name>
+    <value></value>
     <description>
       The kerberos realm: used to set the realm of
       system principals which do not declare their realm,
@@ -2579,26 +2581,24 @@
       If neither are known and the realm is needed, then the registry
       service/client will fail.
     </description>
-    <name>hadoop.registry.kerberos.realm</name>
-    <value></value>
   </property>
 
   <property>
+    <name>hadoop.registry.jaas.context</name>
+    <value>Client</value>
     <description>
       Key to define the JAAS context. Used in secure
       mode
     </description>
-    <name>hadoop.registry.jaas.context</name>
-    <value>Client</value>
   </property>
 
   <property>
+    <name>hadoop.shell.missing.defaultFs.warning</name>
+    <value>false</value>
     <description>
       Enable hdfs shell commands to display warnings if (fs.defaultFS) property
       is not set.
     </description>
-    <name>hadoop.shell.missing.defaultFs.warning</name>
-    <value>false</value>
   </property>
 
   <property>
@@ -2628,13 +2628,13 @@
   </property>
 
   <property>
+    <name>hadoop.http.logs.enabled</name>
+    <value>true</value>
     <description>
       Enable the "/logs" endpoint on all Hadoop daemons, which serves local
       logs, but may be considered a security risk due to it listing the contents
       of a directory.
     </description>
-    <name>hadoop.http.logs.enabled</name>
-    <value>true</value>
   </property>
 
   <property>
@@ -2799,48 +2799,48 @@
   </property>
 
   <property>
-    <description>Host:Port of the ZooKeeper server to be used.
-    </description>
     <name>hadoop.zk.address</name>
     <!--value>127.0.0.1:2181</value-->
+    <description>Host:Port of the ZooKeeper server to be used.
+    </description>
   </property>
 
   <property>
-    <description>Number of tries to connect to ZooKeeper.</description>
     <name>hadoop.zk.num-retries</name>
     <value>1000</value>
+    <description>Number of tries to connect to ZooKeeper.</description>
   </property>
 
   <property>
-    <description>Retry interval in milliseconds when connecting to ZooKeeper.
-    </description>
     <name>hadoop.zk.retry-interval-ms</name>
     <value>1000</value>
+    <description>Retry interval in milliseconds when connecting to ZooKeeper.
+    </description>
   </property>
 
   <property>
+    <name>hadoop.zk.timeout-ms</name>
+    <value>10000</value>
     <description>ZooKeeper session timeout in milliseconds. Session expiration
     is managed by the ZooKeeper cluster itself, not by the client. This value is
     used by the cluster to determine when the client's session expires.
     Expirations happens when the cluster does not hear from the client within
     the specified session timeout period (i.e. no heartbeat).</description>
-    <name>hadoop.zk.timeout-ms</name>
-    <value>10000</value>
   </property>
 
   <property>
-    <description>ACL's to be used for ZooKeeper znodes.</description>
     <name>hadoop.zk.acl</name>
     <value>world:anyone:rwcda</value>
+    <description>ACL's to be used for ZooKeeper znodes.</description>
   </property>
 
   <property>
+    <name>hadoop.zk.auth</name>
     <description>
         Specify the auths to be used for the ACL's specified in hadoop.zk.acl.
         This takes a comma-separated list of authentication mechanisms, each of the
         form 'scheme:auth' (the same syntax used for the 'addAuth' command in
         the ZK CLI).
     </description>
-    <name>hadoop.zk.auth</name>
   </property>
 </configuration>