]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #6155 from dachary/wip-13171-hammer
authorLoic Dachary <loic@dachary.org>
Tue, 10 Nov 2015 09:33:41 +0000 (10:33 +0100)
committerLoic Dachary <loic@dachary.org>
Tue, 10 Nov 2015 09:33:41 +0000 (10:33 +0100)
objecter: cancellation bugs

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osdc/Objecter.h

Simple merge