From 3f7edeb055dd1a0bc5bede3e3262c915328df77e Mon Sep 17 00:00:00 2001
From: Karthik Kambatla <kasha@apache.org>
Date: Tue, 28 Oct 2014 08:49:14 -0700
Subject: [PATCH] YARN-2760. Remove 'experimental' from FairScheduler docs.
 (Harsh J via kasha)

(cherry picked from commit ade3727ecb092935dcc0f1291c1e6cf43d764a03)
---
 hadoop-yarn-project/CHANGES.txt                                | 2 ++
 .../hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm         | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 9c08db7de02..42d5551be3d 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -377,6 +377,8 @@ Release 2.6.0 - UNRELEASED
     YARN-2502. Changed DistributedShell to support node labels. (Wangda Tan via
     jianhe)
 
+    YARN-2760. Remove 'experimental' from FairScheduler docs. (Harsh J via kasha)
+
   OPTIMIZATIONS
 
   BUG FIXES
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm
index 73ce66046f4..ce56b49bb47 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm
@@ -151,8 +151,7 @@ Properties that can be placed in yarn-site.xml
 
  * <<<yarn.scheduler.fair.preemption>>>
 
-    * Whether to use preemption. Note that preemption is experimental in the current
-      version. Defaults to false.
+    * Whether to use preemption. Defaults to false.
 
  * <<<yarn.scheduler.fair.preemption.cluster-utilization-threshold>>>