Return-Path: X-Original-To: apmail-hadoop-yarn-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-yarn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EB8FE1016A for ; Fri, 20 Dec 2013 19:25:08 +0000 (UTC) Received: (qmail 37156 invoked by uid 500); 20 Dec 2013 19:25:08 -0000 Delivered-To: apmail-hadoop-yarn-commits-archive@hadoop.apache.org Received: (qmail 37128 invoked by uid 500); 20 Dec 2013 19:25:08 -0000 Mailing-List: contact yarn-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: yarn-commits@hadoop.apache.org Delivered-To: mailing list yarn-commits@hadoop.apache.org Received: (qmail 37120 invoked by uid 99); 20 Dec 2013 19:25:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Dec 2013 19:25:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Dec 2013 19:25:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B42042388831; Fri, 20 Dec 2013 19:24:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1552789 - in /hadoop/common/branches/branch-2/hadoop-yarn-project: CHANGES.txt hadoop-yarn/hadoop-yarn-site/src/site/apt/CapacityScheduler.apt.vm Date: Fri, 20 Dec 2013 19:24:44 -0000 To: yarn-commits@hadoop.apache.org From: jeagles@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131220192444.B42042388831@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jeagles Date: Fri Dec 20 19:24:43 2013 New Revision: 1552789 URL: http://svn.apache.org/r1552789 Log: YARN-1180. Update capacity scheduler docs to include types on the configs (Chen He via jeagles) Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/CapacityScheduler.apt.vm Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1552789&r1=1552788&r2=1552789&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Fri Dec 20 19:24:43 2013 @@ -1741,7 +1741,22 @@ Release 2.0.2-alpha - 2012-09-07 YARN-138. Ensure default values for minimum/maximum container sizes is sane. (harsh & sseth via acmurthy) -Release 0.23.10 - UNRELEASED +Release 0.23.11 - UNRELEASED + + INCOMPATIBLE CHANGES + + NEW FEATURES + + IMPROVEMENTS + + OPTIMIZATIONS + + BUG FIXES + + YARN-1180. Update capacity scheduler docs to include types on the configs + (Chen He via jeagles) + +Release 0.23.10 - 2013-12-09 INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/CapacityScheduler.apt.vm URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/CapacityScheduler.apt.vm?rev=1552789&r1=1552788&r2=1552789&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/CapacityScheduler.apt.vm (original) +++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/CapacityScheduler.apt.vm Fri Dec 20 19:24:43 2013 @@ -220,7 +220,7 @@ Hadoop MapReduce Next Generation - Capac | | application, no single user can use more than 33% of the queue resources. | | | With 4 or more users, no user can use more than 25% of the queues | | | resources. A value of 100 implies no user limits are imposed. The default | -| | is 100.| +| | is 100. Value is specified as a integer.| *--------------------------------------+--------------------------------------+ | <<.user-limit-factor>>> | | | | The multiple of the queue capacity which can be configured to allow a | @@ -249,6 +249,7 @@ Hadoop MapReduce Next Generation - Capac | | be rejected. Default is 10000. This can be set for all queues with | | | <<>> and can also be overridden on a | | | per queue basis by setting <<.maximum-applications>>>. | +| | Integer value expected.| *--------------------------------------+--------------------------------------+ | <<>> / | | <<.maximum-am-resource-percent>>> | | @@ -276,7 +277,7 @@ Hadoop MapReduce Next Generation - Capac | | Thus, if the queue is <<>> no applications can be | | | submitted to the entire cluster. | | | Existing applications continue to completion, thus the queue can be -| | gracefully. | +| | gracefully. Value is specified as Enumeration. | *--------------------------------------+--------------------------------------+ | <<.acl_submit_applications>>> | | | | The which controls who can applications to the given queue. |