From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 10 Jan 2018 00:56:08 +0000 (-0800)
Subject: Merge PR #19702 into master
X-Git-Tag: v13.0.2~588
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8ab4c18ec1c3e9a81070fdefabbd828f9999a3d2;p=ceph.git

Merge PR #19702 into master

* refs/pull/19702/head:
	client: avoid remove same cap twice

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
---

8ab4c18ec1c3e9a81070fdefabbd828f9999a3d2