[DNM] (cherry picked from commit 85bb43e111692989d2296a389ce45377d2297d6f)

[diluga]

RGW: add socket backlog setting for via ceph.conf
http://tracker.ceph.com/issues/16436
Signed-off-by: Feng Guo diluga@gmail.com

[tchaikov]

should "cherry-pick -x 3e4df83". please fix your commit message and its title.

[smithfarm]

@yehudasa OK to backport this feature to jewel and hammer?

[smithfarm]

The master PR is #9891

[yehudasa]

@smithfarm fine with me

[smithfarm]

@diluga As @tchaikov wrote, the command is git cherry-pick -x 3e4df83 - you are trying to cherry-pick 85bb43e which is the merge commit. That will not work. Once you cherry-pick the correct commit, you will not need to modify the commit message at all, except as described below.

Here is a more detailed HOWTO:

1. checkout the latest hammer branch
2. git checkout -b wip-16436-hammer
3. git cherry-pick -x 3e4df83 <- don't modify the commit message unless there are conflict(s). If there are conflicts, just append a brief description of how you resolved the conflict(s).
4. git push -u origin wip-16436-hammer
5. open PR against hammer

Hope this helps, and thanks for contributing!

[smithfarm]

@diluga I staged the jewel backport at #10216 if you want to look.

[diluga]

@smithfarm thx,a lot! i followed with your guide，and the new PR: #10219

[smithfarm]

@diluga You're welcome! I looked at the commit message in #10219 and there is no description of how the conflicts were resolved. Anyway, don't do anything more until we clarify whether this feature is eligible for backport to hammer at all - it looks like it depends on c52a9fa