Author: wang
Date: Wed Jan 22 21:43:00 2014
New Revision: 1560522
URL: http://svn.apache.org/r1560522
Log:
Merge HDFS-4949 changes from trunk to branch-2.
Modified:
hadoop/common/branches/branch-2/dev-support/test-patch.sh
hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml
Modified: hadoop/common/branches/branch-2/dev-support/test-patch.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/dev-support/test-patch.sh?rev=1560522&r1=1560521&r2=1560522&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/dev-support/test-patch.sh (original)
+++ hadoop/common/branches/branch-2/dev-support/test-patch.sh Wed Jan 22
21:43:00 2014
@@ -395,9 +395,9 @@ checkJavadocWarnings () {
echo ""
echo "There appear to be $javadocWarnings javadoc warnings generated by the
patched build."
- #There are 11 warnings that are caused by things that are caused by using
sun internal APIs.
+ #There are 12 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=13;
+ OK_JAVADOC_WARNINGS=14;
### if current warnings greater than OK_JAVADOC_WARNINGS
if [[ $javadocWarnings -gt $OK_JAVADOC_WARNINGS ]] ; then
JIRA_COMMENT="$JIRA_COMMENT
Modified: hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml?rev=1560522&r1=1560521&r2=1560522&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-project/src/site/site.xml Wed Jan 22
21:43:00 2014
@@ -80,6 +80,7 @@
<item name="HttpFS Gateway" href="hadoop-hdfs-httpfs/index.html"/>
<item name="Short Circuit Local Reads"
href="hadoop-project-dist/hadoop-hdfs/ShortCircuitLocalReads.html"/>
+ <item name="Centralized Cache Management"
href="hadoop-project-dist/hadoop-hdfs/CentralizedCacheManagement.html"/>
<item name="HDFS NFS Gateway"
href="hadoop-project-dist/hadoop-hdfs/HdfsNfsGateway.html"/>
</menu>
