From: Sage Weil <sage@redhat.com>
Date: Wed, 21 Feb 2018 16:23:33 +0000 (-0600)
Subject: Merge PR #20484 into master
X-Git-Tag: v13.0.2~216
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9f5a7ca8bf8fd94ee506c5fa3a8403e8664aff9a;p=ceph.git

Merge PR #20484 into master

* refs/pull/20484/head:
	osd/PrimaryLogPG: cancel all objecter ops atomically
	osdc/Objecter: allow multiple ops to be canceled atomically

Reviewed-by: David Zafman <dzafman@redhat.com>
---

9f5a7ca8bf8fd94ee506c5fa3a8403e8664aff9a