]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
OSD: add command_wq suicide timeout 5159/head
authorSamuel Just <sjust@redhat.com>
Wed, 6 May 2015 17:49:00 +0000 (10:49 -0700)
committerAbhishek Lekshmanan <abhishek.lekshmanan@ril.com>
Wed, 15 Jul 2015 16:37:09 +0000 (22:07 +0530)
commitad5745bfd768b52ae6a766391232becad8587641
treebfab5004406eababa8ac59c7f2fad298dd80e154
parent059a579c02b312bbd32fa41485c361ae3847a3ba
OSD: add command_wq suicide timeout

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit df4e5de819c30003cfbe50a071c49039cf534419)

Conflicts:
src/common/config_opts.h
Trivial merge conflict
src/common/config_opts.h
src/osd/OSD.cc
src/osd/OSD.h