Ceph

@Loïc Dachary Sorry for the late. The reason why I just waited is that there are 2 commits for the bug:

#1 https://github.com/ceph/ceph/pull/13114/commits/1a5cc32f0a3bf5ef06642402e930e3786700ab7d

#2 https://github.com/ceph/ceph/pull/13114/commits/47066ef310e2dea3501657851bf3c2b96efb0669

When I tried to cherry-pick, results for both ended up with:

[root@octopus ceph]# git cherry-pick -x 1a5cc32f0a3bf5ef06642402e930e3786700ab7d
fatal: bad object 1a5cc32f0a3bf5ef06642402e930e3786700ab7d

[root@octopus ceph]# git cherry-pick -x 47066ef310e2dea3501657851bf3c2b96efb0669
fatal: bad object 47066ef310e2dea3501657851bf3c2b96efb0669

There should be missing something. Please advice :)

@Shinobu The idea is to resolve the conflicts, if you can, and describe how you did it in the commit message. This can sometimes be a little tricky. There is some documentation on backporting commits here: http://tracker.ceph.com/projects/ceph-releases/wiki/HOWTO_backport_commits

@Nathan Weinberg Thank you so much for your help. Please let me give it try again and I will write some up here.

@Nathan Weinberg I delete remote branch which was used for PR#13373 because the PR was something definitely wrong and messy because of lack of my knowledge regarding to Git.

I've been getting better understanding how Git works. I will create a new PR.

This backport has been really really good exercise to me :)

@Shinobu Backporting is an excellent way to practice with git :-) HINT: read about "interactive rebasing" - if you make a mistake in a PR, you don't have to close it and open another one. You can rebase your wip branch and then force-push it (git push f origin wip...) and the PR will be automatically updated.