]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da83441 0380054)
Merge pull request #7616 from gregsfortytwo/wip-timer-14697
authorGregory Farnum <greg@gregs42.com>
Tue, 16 Feb 2016 04:35:32 +0000 (20:35 -0800)
committerGregory Farnum <greg@gregs42.com>
Tue, 16 Feb 2016 04:35:32 +0000 (20:35 -0800)
mds: don't double-shutdown the timer when suiciding

Reviewed-by: John Spray <john.spray@redhat.com>
1  2 
src/mds/MDSDaemon.cc patch | diff1 | diff2 | blob | history

diff --cc src/mds/MDSDaemon.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.