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 aa...@apache.org on 2015/04/16 23:41:39 UTC
hadoop git commit: Revert "Merge r1588258 from trunk,
HDFS-6153. Document "fileId" and "childrenNum" fields in the
FileStatus Json schema"
Repository: hadoop
Updated Branches:
refs/heads/branch-2.5 fb7560764 -> 0f146aedc
Revert "Merge r1588258 from trunk, HDFS-6153. Document "fileId" and "childrenNum" fields in the FileStatus Json schema"
This reverts commit 641cbc0febe546e350a5fd4f37e717f2b8e52d6f.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0f146aed
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0f146aed
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0f146aed
Branch: refs/heads/branch-2.5
Commit: 0f146aedc87963f1e4122dd8885c14e40abe3f6d
Parents: fb75607
Author: Akira Ajisaka <aa...@apache.org>
Authored: Thu Apr 16 16:37:39 2015 -0500
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Thu Apr 16 16:37:39 2015 -0500
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 ---
.../hadoop-hdfs/src/site/apt/WebHDFS.apt.vm | 18 ------------------
2 files changed, 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0f146aed/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 5699ba9..397a7c6 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -348,9 +348,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/0f146aed/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/WebHDFS.apt.vm
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/WebHDFS.apt.vm b/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/WebHDFS.apt.vm
index aad95eb..9bec16e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/WebHDFS.apt.vm
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/WebHDFS.apt.vm
@@ -509,8 +509,6 @@ Transfer-Encoding: chunked
{
"accessTime" : 0,
"blockSize" : 0,
- "childrenNum" : 1,
- "fileId" : 16386,
"group" : "supergroup",
"length" : 0, //in bytes, zero for directories
"modificationTime": 1320173277227,
@@ -552,8 +550,6 @@ Content-Length: 427
{
"accessTime" : 1320171722771,
"blockSize" : 33554432,
- "childrenNum" : 0,
- "fileId" : 16387,
"group" : "supergroup",
"length" : 24930,
"modificationTime": 1320171722771,
@@ -566,8 +562,6 @@ Content-Length: 427
{
"accessTime" : 0,
"blockSize" : 0,
- "childrenNum" : 2,
- "fileId" : 16388,
"group" : "supergroup",
"length" : 0,
"modificationTime": 1320895981256,
@@ -1667,18 +1661,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.",