From: Sage Weil Date: Mon, 10 Jul 2017 21:49:01 +0000 (-0500) Subject: Merge pull request #16235 from tchaikov/wip-timer X-Git-Tag: v12.1.1~89 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7f03169df4c3d89dc1dbefeb2b58cccfb1268a09;p=ceph.git Merge pull request #16235 from tchaikov/wip-timer os/filestore: do not free event if not added Reviewed-by: Josh Durgin --- 7f03169df4c3d89dc1dbefeb2b58cccfb1268a09