From: Jason Dillaman Date: Wed, 27 Jan 2016 14:11:55 +0000 (-0500) Subject: Merge pull request #7329 from fullerdj/wip-14476 X-Git-Tag: v10.0.4~168 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=92f4b517e35a2e066d4a23bef886164f2b7792cf;p=ceph.git Merge pull request #7329 from fullerdj/wip-14476 librbd: remove canceled tasks from timer thread Reviewed-by: Jason Dillaman --- 92f4b517e35a2e066d4a23bef886164f2b7792cf