From 732c70f81494b66151300fc6b75aa161fa6e2a1f Mon Sep 17 00:00:00 2001
From: Sanford Ryza <sandy@apache.org>
Date: Thu, 29 Aug 2013 02:24:43 +0000
Subject: [PATCH] YARN-1034. Remove experimental in the Fair Scheduler
 documentation. (Karthik Kambatla via Sandy Ryza)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518445 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-yarn-project/CHANGES.txt                                | 3 +++
 .../hadoop-yarn-site/src/site/apt/FairScheduler.apt.vm         | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 3206b812476..17e332867b8 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -45,6 +45,9 @@ Release 2.1.1-beta - UNRELEASED
     YARN-1081. Made a trivial change to YARN node CLI header to avoid potential
     confusion. (Akira AJISAKA via vinodkv)
 
+    YARN-1034. Remove "experimental" in the Fair Scheduler documentation.
+    (Karthik Kambatla via Sandy Ryza)
+
   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 5d8083423f7..84d6ca29119 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
@@ -25,8 +25,7 @@ Hadoop MapReduce Next Generation - Fair Scheduler
 * {Purpose} 
 
   This document describes the <<<FairScheduler>>>, a pluggable scheduler for Hadoop 
-  which provides a way to share large clusters. <<NOTE:>> The Fair Scheduler 
-  implementation is currently under development and should be considered experimental.
+  that allows YARN applications to share resources in large clusters fairly.
 
 * {Introduction}