From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 1 Nov 2018 21:58:23 +0000 (-0700)
Subject: Merge PR #24555 into master
X-Git-Tag: v14.1.0~1019
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f981e10c5f5fc35f14a62cc443801e3931a45ca2;p=ceph.git

Merge PR #24555 into master

* refs/pull/24555/head:
	doc: document optional timeout argument for `cache drop`
	mds: make timeout parameter optional for "cache drop"

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

f981e10c5f5fc35f14a62cc443801e3931a45ca2