HDFS-13076: [SPS]: Addendum. Resolve conflicts after rebasing branch to trunk. Contributed by Rakesh R.
This commit is contained in:
parent
db3f227d8a
commit
dfcb331ba3
|
@ -3624,8 +3624,8 @@ public class DataNode extends ReconfigurableBase
|
||||||
}
|
}
|
||||||
return this.diskBalancer;
|
return this.diskBalancer;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
StoragePolicySatisfyWorker getStoragePolicySatisfyWorker() {
|
StoragePolicySatisfyWorker getStoragePolicySatisfyWorker() {
|
||||||
return storagePolicySatisfyWorker;
|
return storagePolicySatisfyWorker;
|
||||||
}}
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue