Author: szetszwo
Date: Tue Nov 22 20:12:03 2011
New Revision: 1205150
URL: http://svn.apache.org/viewvc?rev=1205150&view=rev
Log:
svn merge -c 1205148 from branch-0.20-security for HDFS-2552.
Added:
hadoop/common/branches/branch-0.20-security-205/src/docs/src/documentation/content/xdocs/webhdfs.xml
- copied unchanged from r1205148,
hadoop/common/branches/branch-0.20-security/src/docs/src/documentation/content/xdocs/webhdfs.xml
Modified:
hadoop/common/branches/branch-0.20-security-205/ (props changed)
hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (contents,
props changed)
hadoop/common/branches/branch-0.20-security-205/src/docs/src/documentation/content/xdocs/site.xml
Propchange: hadoop/common/branches/branch-0.20-security-205/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 20:12:03 2011
@@ -1,6 +1,6 @@
/hadoop/common/branches/branch-0.20:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225
/hadoop/common/branches/branch-0.20-append:955380,955398,955448,956329
-/hadoop/common/branches/branch-0.20-security:1170042,1170087,1170997,1171137,1171380,1171613,1171891,1171905,1172184,1172188,1172190,1172192,1173470,1174471,1175114,1176179,1176720,1177907,1179036,1179171,1179519,1179857,1183086,1183101,1183176,1183556,1186509,1187141,1189029,1189361,1190079,1190089,1190100,1195737,1197330,1198906,1199401,1199571,1200733
+/hadoop/common/branches/branch-0.20-security:1170042,1170087,1170997,1171137,1171380,1171613,1171891,1171905,1172184,1172188,1172190,1172192,1173470,1174471,1175114,1176179,1176720,1177907,1179036,1179171,1179519,1179857,1183086,1183101,1183176,1183556,1186509,1187141,1189029,1189361,1190079,1190089,1190100,1195737,1197330,1198906,1199401,1199571,1200733,1205148
/hadoop/common/branches/branch-0.20-security-203:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
/hadoop/common/branches/branch-0.20-security-204:1128390,1147228,1148069,1149316,1154413
/hadoop/core/branches/branch-0.19:713112
Modified: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt?rev=1205150&r1=1205149&r2=1205150&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-205/CHANGES.txt Tue Nov 22
20:12:03 2011
@@ -42,6 +42,8 @@ Release 0.20.205.1 - unreleased
MAPREDUCE-3169. Create a new MiniMRCluster equivalent which only provides
client APIs cross MR1 and MR2. (Ahmed via tucu)
+ HDFS-2552. Add Forrest doc for WebHDFS REST API. (szetszwo)
+
BUG FIXES
HADOOP-7815. Fixed configuring map memory mb in hadoop-setup-conf.sh.
Propchange: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 20:12:03 2011
@@ -1,6 +1,6 @@
/hadoop/common/branches/branch-0.20/CHANGES.txt:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225
/hadoop/common/branches/branch-0.20-append/CHANGES.txt:955380,955398,955448,956329
-/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1170042,1170087,1170997,1171137,1171181,1171380,1171613,1171891,1171905,1172184,1172188,1172190,1172192,1173470,1173843,1174326,1174471,1174476,1174482,1175114,1176179,1176182,1176270,1176276,1176675,1176720,1177031,1177036,1177098,1177101,1177907,1178074,1179036,1179171,1179471,1179519,1179713,1179722,1179857,1179919,1183086,1183101,1183176,1183556,1186509,1187141,1189029,1189361,1190079,1190089,1190100,1195737,1197330,1198906,1199401,1199571,1200733
+/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1170042,1170087,1170997,1171137,1171181,1171380,1171613,1171891,1171905,1172184,1172188,1172190,1172192,1173470,1173843,1174326,1174471,1174476,1174482,1175114,1176179,1176182,1176270,1176276,1176675,1176720,1177031,1177036,1177098,1177101,1177907,1178074,1179036,1179171,1179471,1179519,1179713,1179722,1179857,1179919,1183086,1183101,1183176,1183556,1186509,1187141,1189029,1189361,1190079,1190089,1190100,1195737,1197330,1198906,1199401,1199571,1200733,1205148
/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
/hadoop/common/branches/branch-0.20-security-204/CHANGES.txt:1128390,1147228,1148069,1149316,1154413,1159730,1161741
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
Modified:
hadoop/common/branches/branch-0.20-security-205/src/docs/src/documentation/content/xdocs/site.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/docs/src/documentation/content/xdocs/site.xml?rev=1205150&r1=1205149&r2=1205150&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-205/src/docs/src/documentation/content/xdocs/site.xml
(original)
+++
hadoop/common/branches/branch-0.20-security-205/src/docs/src/documentation/content/xdocs/site.xml
Tue Nov 22 20:12:03 2011
@@ -60,6 +60,7 @@ See http://forrest.apache.org/docs/linki
<hdfs_perm label="Permissions" href="hdfs_permissions_guide.html" />
<hdfs_quotas label="Quotas" href="hdfs_quota_admin_guide.html" />
<hdfs_SLG label="Synthetic Load Generator"
href="SLG_user_guide.html" />
+ <webhdfs label="WebHdfs" href="webhdfs.html" />
<hdfs_libhdfs label="C API libhdfs" href="libhdfs.html" />
</docs>
@@ -142,7 +143,40 @@ See http://forrest.apache.org/docs/linki
</filecache>
<fs href="fs/">
<filesystem href="FileSystem.html" />
+ <FileStatus href="FileStatus.html" />
+ <Path href="Path.html" />
</fs>
+
+
+
+
+ <hdfs href="hdfs/">
+ <DistributedFileSystem href="DistributedFileSystem.html">
+ <open href="#open(org.apache.hadoop.fs.Path,%20int)" />
+ <getFileStatus
href="#getFileStatus(org.apache.hadoop.fs.Path)" />
+ <listStatus href="#listStatus(org.apache.hadoop.fs.Path)" />
+ <getContentSummary
href="#getContentSummary(org.apache.hadoop.fs.Path)" />
+ <getFileChecksum
href="#getFileChecksum(org.apache.hadoop.fs.Path)" />
+ <getHomeDirectory href="#getHomeDirectory()" />
+ <getDelegationToken
href="#getDelegationToken(org.apache.hadoop.io.Text)" />
+
+ <create
href="#create(org.apache.hadoop.fs.Path,%20org.apache.hadoop.fs.permission.FsPermission,%20boolean,%20int,%20short,%20long,%20org.apache.hadoop.util.Progressable)"
/>
+ <mkdirs
href="#mkdirs(org.apache.hadoop.fs.Path,%20org.apache.hadoop.fs.permission.FsPermission)"
/>
+ <rename
href="#rename(org.apache.hadoop.fs.Path,%20org.apache.hadoop.fs.Path,%20org.apache.hadoop.fs.Options.Rename...)"
/>
+ <setReplication
href="#setReplication(org.apache.hadoop.fs.Path,%20short)" />
+ <setOwner
href="#setOwner(org.apache.hadoop.fs.Path,%20java.lang.String,%20java.lang.String)"
/>
+ <setPermission
href="#setPermission(org.apache.hadoop.fs.Path,%20org.apache.hadoop.fs.permission.FsPermission)"
/>
+ <setTimes
href="#setTimes(org.apache.hadoop.fs.Path,%20long,%20long)" />
+ <renewDelegationToken
href="#renewDelegationToken(org.apache.hadoop.security.token.Token)" />
+ <cancelDelegationToken
href="#cancelDelegationToken(org.apache.hadoop.security.token.Token)" />
+
+ <append
href="#append(org.apache.hadoop.fs.Path,%20int,%20org.apache.hadoop.util.Progressable)"
/>
+ <delete href="#delete(org.apache.hadoop.fs.Path,%20boolean)" />
+ </DistributedFileSystem>
+ </hdfs>
+
+
+
<io href="io/">
<closeable href="Closeable.html">
<close href="#close()" />
