steveloughran commented on issue #716: HADOOP-16205 Backporting ABFS driver from trunk to branch 2.0 URL: https://github.com/apache/hadoop/pull/716#issuecomment-486201741 checked out and applied to branch-2 (at commit #c9bfeb225b9); rebuilt, retested +1 for the patch, once the conflict with commit #313608e4596 is addressed (ie. remove the DTD changes from the checkstyles). Now, best way to merge this in? We were going to do the full sequence as a merge patch, weren't we? that is: 1. I locally fork branch-2 1. apply the sequence of commits to it 1. Merge that fork into branch-2 as a merge commit 1. retest, if all good: commit to ASF repo? Given that this PR is ~this, if you can roll back to commit #e8dfdae066e, apply c3e474fa890 to that and then push it out again, that should be the entire branch history needed to commit
---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
