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 ae...@apache.org on 2016/10/21 22:44:15 UTC

hadoop git commit: fix a build break due to merge

Repository: hadoop
Updated Branches:
  refs/heads/HDFS-7240 a9e45ed3e -> 11ec1c69a


fix a build break due to merge


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

Branch: refs/heads/HDFS-7240
Commit: 11ec1c69aa79e9fa2d6f3c2bd6cce4fa4bce4f14
Parents: a9e45ed
Author: Anu Engineer <ae...@apache.org>
Authored: Fri Oct 21 15:41:14 2016 -0700
Committer: Anu Engineer <ae...@apache.org>
Committed: Fri Oct 21 15:41:14 2016 -0700

----------------------------------------------------------------------
 .../org/apache/hadoop/ozone/storage/StorageContainerManager.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/11ec1c69/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/storage/StorageContainerManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/storage/StorageContainerManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/storage/StorageContainerManager.java
index 6567ae4..5ffcef1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/storage/StorageContainerManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/ozone/storage/StorageContainerManager.java
@@ -247,7 +247,7 @@ public class StorageContainerManager
     for (int r = 0; r < reports.length; r++) {
       final BlockListAsLongs storageContainerList = reports[r].getBlocks();
       blockManager.processReport(registration, reports[r].getStorage(),
-          storageContainerList, context, r == (reports.length - 1));
+          storageContainerList, context);
     }
     return null;
   }


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org