You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ha...@apache.org on 2008/12/19 02:25:39 UTC
svn commit: r727880 - in /hadoop/core/branches/branch-0.20: ./ CHANGES.txt
src/docs/src/documentation/content/xdocs/hdfs_quota_admin_guide.xml
Author: hairong
Date: Thu Dec 18 17:25:38 2008
New Revision: 727880
URL: http://svn.apache.org/viewvc?rev=727880&view=rev
Log:
Merge -r 727116:727117 from main to move the change of HADOOP-4821 to branch 0.20.
Modified:
hadoop/core/branches/branch-0.20/ (props changed)
hadoop/core/branches/branch-0.20/CHANGES.txt (contents, props changed)
hadoop/core/branches/branch-0.20/src/docs/src/documentation/content/xdocs/hdfs_quota_admin_guide.xml
Propchange: hadoop/core/branches/branch-0.20/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 18 17:25:38 2008
@@ -1,2 +1,2 @@
/hadoop/core/branches/branch-0.19:713112
-/hadoop/core/trunk:727001,727191,727212,727217,727228,727255,727869
+/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869
Modified: hadoop/core/branches/branch-0.20/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=727880&r1=727879&r2=727880&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/CHANGES.txt Thu Dec 18 17:25:38 2008
@@ -484,6 +484,9 @@
HADOOP-4836. Correct typos in mapred related documentation. (Jord? Polo
via szetszwo)
+ HADOOP-4821. Usage description in the Quotas guide documentations are
+ incorrect. (Boris Shkolnik via hairong)
+
Release 0.19.0 - 2008-11-18
INCOMPATIBLE CHANGES
Propchange: hadoop/core/branches/branch-0.20/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 18 17:25:38 2008
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
-/hadoop/core/trunk/CHANGES.txt:727001,727191,727212,727228,727255,727869
+/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869
Modified: hadoop/core/branches/branch-0.20/src/docs/src/documentation/content/xdocs/hdfs_quota_admin_guide.xml
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/docs/src/documentation/content/xdocs/hdfs_quota_admin_guide.xml?rev=727880&r1=727879&r2=727880&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/src/docs/src/documentation/content/xdocs/hdfs_quota_admin_guide.xml (original)
+++ hadoop/core/branches/branch-0.20/src/docs/src/documentation/content/xdocs/hdfs_quota_admin_guide.xml Thu Dec 18 17:25:38 2008
@@ -60,21 +60,21 @@
<ul>
- <li> <code>dfsadmin -setquota <N> <directory>...<directory></code> <br /> Set the name quota to be <code>N</code> for
+ <li> <code>dfsadmin -setQuota <N> <directory>...<directory></code> <br /> Set the name quota to be <code>N</code> for
each directory. Best effort for each directory, with faults reported if <code>N</code> is not a positive long integer, the
directory does not exist or it is a file, or the directory would immediately exceed the new quota. </li>
- <li> <code>dfsadmin -clrquota <directory>...<director></code><br /> Remove any name quota for each directory. Best
+ <li> <code>dfsadmin -clrQuota <directory>...<director></code><br /> Remove any name quota for each directory. Best
effort for each directory, with faults reported if the directory does not exist or it is a file. It is not a fault if the
directory has no quota. </li>
- <li> <code>dfsadmin -setspacequota <N> <directory>...<directory></code> <br /> Set the space quota to be
+ <li> <code>dfsadmin -setSpaceQuota <N> <directory>...<directory></code> <br /> Set the space quota to be
N bytes for each directory. N can also be specified with a binary prefix for convenience, for e.g. 50g for 50 gigabytes and
2t for 2 terabytes etc. Best effort for each directory, with faults reported if <code>N</code> is
neither zero nor a positive integer, the directory does not exist or it is a file, or the directory would immediately exceed
the new quota. </li>
- <li> <code>dfsadmin -clrspacequota <directory>...<director></code><br /> Remove any space quota for each directory. Best
+ <li> <code>dfsadmin -clrSpaceQuota <directory>...<director></code><br /> Remove any space quota for each directory. Best
effort for each directory, with faults reported if the directory does not exist or it is a file. It is not a fault if the
directory has no quota. </li>