[
https://issues.apache.org/jira/browse/HDFS-5148?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Arpit Agarwal updated HDFS-5148:
--------------------------------
Summary: Resolve merge conflicts in commitBlockSynchronization (was:
Resolve trunk merge failure caused by HDFS-5077 )
> Resolve merge conflicts in commitBlockSynchronization
> -----------------------------------------------------
>
> Key: HDFS-5148
> URL: https://issues.apache.org/jira/browse/HDFS-5148
> Project: Hadoop HDFS
> Issue Type: Sub-task
> Components: namenode
> Affects Versions: Heterogeneous Storage (HDFS-2832)
> Reporter: Arpit Agarwal
> Assignee: Arpit Agarwal
> Attachments: h5148.01.patch, h5148.02.patch
>
>
> Fixes to commitBlockSynchronization in trunk (HDFS-5077) cause build failures
> when trunk is merged into HDFS-2832. Filing Jira to fix the issue.
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira