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 zj...@apache.org on 2015/04/18 00:36:06 UTC

[38/50] [abbrv] hadoop git commit: Revert "HDFS-6153. Document "fileId" and "childrenNum" fields in the FileStatus Json schema"

Revert "HDFS-6153. Document "fileId" and "childrenNum" fields in the FileStatus Json schema"

This reverts commit eb1d4c39e00e2a962e1a00192b952e1ba8bc4633.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f150002c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f150002c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f150002c

Branch: refs/heads/YARN-2928
Commit: f150002ccb34fac246adca868d24213df2274e3b
Parents: 05eac26
Author: Akira Ajisaka <aa...@apache.org>
Authored: Thu Apr 16 16:54:01 2015 -0500
Committer: Zhijie Shen <zj...@apache.org>
Committed: Fri Apr 17 15:29:46 2015 -0700

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt       |  3 ---
 .../hadoop-hdfs/src/site/markdown/WebHDFS.md      | 18 ------------------
 2 files changed, 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/f150002c/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index c0472aa..dd0979b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -2940,9 +2940,6 @@ Release 2.5.0 - 2014-08-11
 
     HDFS-4909. Avoid protocol buffer RPC namespace clashes. (cmccabe)
 
-    HDFS-6153. Document "fileId" and "childrenNum" fields in the FileStatus Json schema
-    (Akira Ajisaka via vinayakumarb)
-
     HDFS-6178. Decommission on standby NN couldn't finish. (Ming Ma via jing9)
 
     HDFS-6213. TestDataNodeConfig failing on Jenkins runs due to DN web port

http://git-wip-us.apache.org/repos/asf/hadoop/blob/f150002c/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/WebHDFS.md
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/WebHDFS.md b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/WebHDFS.md
index 7afb0f5..6432c57a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/WebHDFS.md
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/WebHDFS.md
@@ -426,8 +426,6 @@ See also: [`newlength`](#New_Length), [FileSystem](../../api/org/apache/hadoop/f
           {
             "accessTime"      : 0,
             "blockSize"       : 0,
-            "childrenNum"     : 1,
-            "fileId"          : 16386,
             "group"           : "supergroup",
             "length"          : 0,             //in bytes, zero for directories
             "modificationTime": 1320173277227,
@@ -461,8 +459,6 @@ See also: [FileSystem](../../api/org/apache/hadoop/fs/FileSystem.html).getFileSt
               {
                 "accessTime"      : 1320171722771,
                 "blockSize"       : 33554432,
-                "childrenNum"     : 0,
-                "fileId"          : 16387,
                 "group"           : "supergroup",
                 "length"          : 24930,
                 "modificationTime": 1320171722771,
@@ -475,8 +471,6 @@ See also: [FileSystem](../../api/org/apache/hadoop/fs/FileSystem.html).getFileSt
               {
                 "accessTime"      : 0,
                 "blockSize"       : 0,
-                "childrenNum"     : 2,
-                "fileId"          : 16388,
                 "group"           : "supergroup",
                 "length"          : 0,
                 "modificationTime": 1320895981256,
@@ -1323,18 +1317,6 @@ var fileStatusProperties =
       "type"       : "integer",
       "required"   : true
     },
-    "childrenNum":
-    {
-      "description": "The number of children.",
-      "type"       : "integer",
-      "required"   : true
-    },
-    "fileId":
-    {
-      "description": "The inode ID.",
-      "type"       : "integer",
-      "required"   : true
-    },
     "group":
     {
       "description": "The group owner.",