From: Loic Dachary Date: Mon, 8 Feb 2016 15:23:01 +0000 (+0700) Subject: Merge pull request #7426 from Abhishekvrshny/wip-14552-infernalis X-Git-Tag: v9.2.1~14 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2de60165dd76ece7dc84326e2721d61cde05e004;p=ceph.git Merge pull request #7426 from Abhishekvrshny/wip-14552-infernalis infernalis: rbd: TaskFinisher::cancel should remove event from SafeTimer Reviewed-by: Jason Dillaman --- 2de60165dd76ece7dc84326e2721d61cde05e004