From 67cc24a7a429edd6132af6c4fd763e23fda29947 Mon Sep 17 00:00:00 2001
From: Giovanni Matteo Fumarola <gifuma@apache.org>
Date: Tue, 12 Mar 2019 15:21:03 -0700
Subject: [PATCH] YARN-9381. The yarn-default.xml has two identical property
 named yarn.timeline-service.http-cross-origin.enabled. Contributed by
 Abhishek Modi.

---
 .../src/main/resources/yarn-default.xml               | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
index 99105c8aebb..dfbffd4c740 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
@@ -3603,17 +3603,6 @@
     <value>64</value>
   </property>
 
-  <property>
-    <description>
-      Flag to enable cross-origin (CORS) support for timeline service v1.x or
-      Timeline Reader in timeline service v2. For timeline service v2, also add
-      org.apache.hadoop.security.HttpCrossOriginFilterInitializer to the
-      configuration hadoop.http.filter.initializers in core-site.xml.
-    </description>
-    <name>yarn.timeline-service.http-cross-origin.enabled</name>
-    <value>false</value>
-  </property>
- 
   <property>
     <description>
       Flag to enable cross-origin (CORS) support for timeline service v1.x or