From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 30 Nov 2017 06:11:22 +0000 (-0800)
Subject: Merge PR #18995 into master
X-Git-Tag: v13.0.1~52
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a3be080d03a76870fd28f2bc7a609fd8a6c3aa8f;p=ceph-ci.git

Merge PR #18995 into master

* refs/pull/18995/head:
	client: emplace Cap in Inode caps map

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

a3be080d03a76870fd28f2bc7a609fd8a6c3aa8f