]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #26469 into master
authorSage Weil <sage@redhat.com>
Tue, 19 Feb 2019 14:31:39 +0000 (08:31 -0600)
committerSage Weil <sage@redhat.com>
Tue, 19 Feb 2019 14:31:39 +0000 (08:31 -0600)
* refs/pull/26469/head:
common/ceph_timer: stop timer's thread when it is suspended

Reviewed-by: Neha Ojha <nojha@redhat.com>

Trivial merge