[DNM] hammer: rbd: fix coding mistake in pre-refactor rbd CLI

[YankunLi]

http://tracker.ceph.com/issues/17671

[tchaikov]

could you prefix the title of your commit message with the subcomponent your are changing ? see https://github.com/ceph/ceph/blob/master/SubmittingPatches.rst#preparing-and-sending-patches, in this case, "rbd: " would suffice.

@smithfarm do we need a ticket for this issue?

[dillaman]

lgtm

[smithfarm]

@tchaikov Yes, I opened the tracker issue and linked it.

[smithfarm]

@YankunLi Could you rebase please?

[smithfarm]

@YankunLi Please also add a line Fixes: http://tracker.ceph.com/issues/17671 to the commit message, right above the Signed-off-by: line. Thanks.

[YankunLi]

@smithfarm, Thinks, i have rebase this branch, and update the comment.

[smithfarm]

@YankunLi Please rebase again to get rid of the merge commit. First, git rebase -i HEAD~2 and then, in the editor that appears, delete the line corresponding to the merge commit. Then save and exit from the editor. Then git push -f origin fix_bug_EXPORT_DIFF1 to force-push the changes to github. Thanks!

[smithfarm]

Marking DNM (and replacing with #11948 ) until we can get the merge commit removed.

[smithfarm]

@YankunLi Please rebase again to get rid of the merge commits. First, git rebase -i HEAD~2 and then, in the editor that appears, delete the lines corresponding to the merge commits. Then save and exit from the editor. Then git push -f origin fix_bug_EXPORT_DIFF1 to force-push the changes to github.

Please do not use "git merge" because that introduces additional merge commits that are undesirable.

[smithfarm]

@YankunLi I'm closing this for now, because #11948 has already been reviewed and tested.

Your help with backports and stable releases is most welcome. Please consider studying tutorials on "git interactive rebasing" and "git commit --amend" for modifying PRs.