Fix build break after merging trunk
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f827d3b2 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f827d3b2 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f827d3b2 Branch: refs/heads/HDFS-7240 Commit: f827d3b25212f41f5b9395b5a04b3f1ed1ec2697 Parents: dd784e9 Author: Arpit Agarwal <[email protected]> Authored: Sat Jun 20 14:23:16 2015 -0700 Committer: Arpit Agarwal <[email protected]> Committed: Sat Jun 20 14:23:16 2015 -0700 ---------------------------------------------------------------------- .../hadoop/storagecontainer/StorageContainerNameService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f827d3b2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/storagecontainer/StorageContainerNameService.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/storagecontainer/StorageContainerNameService.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/storagecontainer/StorageContainerNameService.java index 23f2ade..dd3bb67 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/storagecontainer/StorageContainerNameService.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/storagecontainer/StorageContainerNameService.java @@ -19,6 +19,7 @@ package org.apache.hadoop.storagecontainer; import org.apache.hadoop.hdfs.protocol.Block; +import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfo; import org.apache.hadoop.hdfs.server.blockmanagement.BlockInfoUnderConstruction; import org.apache.hadoop.hdfs.server.namenode.NameNode; import org.apache.hadoop.hdfs.server.namenode.Namesystem; @@ -149,7 +150,7 @@ public class StorageContainerNameService implements Namesystem { } @Override - public void decrementSafeBlockCount(Block b) { + public void decrementSafeBlockCount(BlockInfo b) { // Do nothing } }
