Repository: hadoop
Updated Branches:
  refs/heads/branch-2.8 98436a2eb -> f9ebcebe7


HADOOP-14814. Fix incompatible API change on FsServerDefaults to HADOOP-14104. 
Contributed by Junping Du.

(cherry picked from commit 41480233a9cfb0bcfb69cc0f1594120e7656f031)
(cherry picked from commit 7dd5bb949206fb635d875cd651292b451267a951)


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

Branch: refs/heads/branch-2.8
Commit: f9ebcebe74201b1c3997269927dfade50d89a201
Parents: 98436a2
Author: Junping Du <junping...@apache.org>
Authored: Wed Aug 30 13:30:14 2017 -0700
Committer: Junping Du <junping...@apache.org>
Committed: Wed Aug 30 13:33:42 2017 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/fs/FsServerDefaults.java    | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/f9ebcebe/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsServerDefaults.java
----------------------------------------------------------------------
diff --git 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsServerDefaults.java
 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsServerDefaults.java
index 9933e5d..6f82932 100644
--- 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsServerDefaults.java
+++ 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsServerDefaults.java
@@ -63,6 +63,15 @@ public class FsServerDefaults implements Writable {
   public FsServerDefaults(long blockSize, int bytesPerChecksum,
       int writePacketSize, short replication, int fileBufferSize,
       boolean encryptDataTransfer, long trashInterval,
+      DataChecksum.Type checksumType) {
+    this(blockSize, bytesPerChecksum, writePacketSize, replication,
+        fileBufferSize, encryptDataTransfer, trashInterval, checksumType,
+        null, (byte) 0);
+  }
+
+  public FsServerDefaults(long blockSize, int bytesPerChecksum,
+      int writePacketSize, short replication, int fileBufferSize,
+      boolean encryptDataTransfer, long trashInterval,
       DataChecksum.Type checksumType, String keyProviderUri) {
     this(blockSize, bytesPerChecksum, writePacketSize, replication,
         fileBufferSize, encryptDataTransfer, trashInterval, checksumType,


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

Reply via email to