From: Loic Dachary <loic@dachary.org>
Date: Tue, 10 Nov 2015 09:33:41 +0000 (+0100)
Subject: Merge pull request #6155 from dachary/wip-13171-hammer
X-Git-Tag: v0.94.6~86
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=92b21532f64792da023188d9aa620d900c0245ca;p=ceph.git

Merge pull request #6155 from dachary/wip-13171-hammer

objecter: cancellation bugs

Reviewed-by: Sage Weil <sage@redhat.com>
---

92b21532f64792da023188d9aa620d900c0245ca