[
https://issues.apache.org/jira/browse/HDFS-5148?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13756940#comment-13756940
]
Tsz Wo (Nicholas), SZE commented on HDFS-5148:
----------------------------------------------
Hi Arpit, HDFS-5077 was committed with revision r1518851. Let's merge r1518851
separately. I just have merged the branch from trunk up to r1518850, i.e.
r(1518851 - 1). Could you update your code base and then post a patch just for
r1518851?
> 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 resolve the conflicts and
> reconcile the branches.
--
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
