Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
Reply-To: common-dev@hadoop.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1563385 [1/3] - in /hadoop/common/branches/HDFS-5535: ./
 dev-support/ hadoop-tools/hadoop-sls/src/main/data/
 hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/
Date: Sat, 01 Feb 2014 09:01:42 -0000
To: common-commits@hadoop.apache.org
From: szetszwo@apache.org
Message-Id: <20140201090142.EA352238883D@eris.apache.org>

Author: szetszwo
Date: Sat Feb  1 09:01:41 2014
New Revision: 1563385

URL: http://svn.apache.org/r1563385
Log:
Merge r1555021 through r1563384 from trunk.

Added:
    hadoop/common/branches/HDFS-5535/dev-support/create-release.sh
      - copied unchanged from r1563384, hadoop/common/trunk/dev-support/create-release.sh
Modified:
    hadoop/common/branches/HDFS-5535/   (props changed)
    hadoop/common/branches/HDFS-5535/dev-support/test-patch.sh
    hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json
    hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java

Propchange: hadoop/common/branches/HDFS-5535/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk:r1563042-1563384

Modified: hadoop/common/branches/HDFS-5535/dev-support/test-patch.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/dev-support/test-patch.sh?rev=1563385&r1=1563384&r2=1563385&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/dev-support/test-patch.sh (original)
+++ hadoop/common/branches/HDFS-5535/dev-support/test-patch.sh Sat Feb  1 09:01:41 2014
@@ -425,9 +425,9 @@ checkJavadocWarnings () {
   echo ""
   echo "There appear to be $javadocWarnings javadoc warnings generated by the patched build."
 
-  #There are 12 warnings that are caused by things that are caused by using sun internal APIs.
+  #There are 14 warnings that are caused by things that are caused by using sun internal APIs.
   #There are 2 warnings that are caused by the Apache DS Dn class used in MiniKdc.
-  OK_JAVADOC_WARNINGS=14;
+  OK_JAVADOC_WARNINGS=16;
   ### if current warnings greater than OK_JAVADOC_WARNINGS
   if [[ $javadocWarnings -ne $OK_JAVADOC_WARNINGS ]] ; then
     JIRA_COMMENT="$JIRA_COMMENT