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 ra...@apache.org on 2018/07/20 05:31:03 UTC
hadoop git commit: HDFS-13076: [SPS]: Addendum. Resolve conflicts
after rebasing branch to trunk. Contributed by Rakesh R.
Repository: hadoop
Updated Branches:
refs/heads/HDFS-10285 83552dc0b -> ad0f6ba07
HDFS-13076: [SPS]: Addendum. Resolve conflicts after rebasing branch to trunk. Contributed by Rakesh R.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ad0f6ba0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ad0f6ba0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ad0f6ba0
Branch: refs/heads/HDFS-10285
Commit: ad0f6ba07f77e9f7659bb7fea7ae239d38ff49dd
Parents: 83552dc
Author: Rakesh Radhakrishnan <ra...@apache.org>
Authored: Fri Jul 20 10:59:16 2018 +0530
Committer: Rakesh Radhakrishnan <ra...@apache.org>
Committed: Fri Jul 20 10:59:16 2018 +0530
----------------------------------------------------------------------
.../java/org/apache/hadoop/hdfs/server/datanode/DataNode.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ad0f6ba0/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
index 565faec..c2aaea2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
@@ -3621,8 +3621,8 @@ public class DataNode extends ReconfigurableBase
}
return this.diskBalancer;
}
-}
StoragePolicySatisfyWorker getStoragePolicySatisfyWorker() {
return storagePolicySatisfyWorker;
- }}
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org