From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 9 Apr 2019 13:17:26 +0000 (-0700)
Subject: Merge PR #27412 into master
X-Git-Tag: v15.1.0~2983
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c5e8c22ab653f58bfdd8abbf818c6c92c7326e62;p=ceph-ci.git

Merge PR #27412 into master

* refs/pull/27412/head:
	doc: add doc for blacklisting older CephFS clients

Reviewed-by: Barbora Ančincová <bara@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
---

c5e8c22ab653f58bfdd8abbf818c6c92c7326e62
diff --cc .githubmap
index ce99e7ac7ec,ce99e7ac7ec..79a3dbb8039
--- a/.githubmap
+++ b/.githubmap
@@@ -96,3 -96,3 +96,4 @@@ yuvalif Yuval Lifshitz <ylifshit@redhat
  mikechristie Mike Christie <mchristi@redhat.com>
  andrewschoen Andrew Schoen <aschoen@redhat.com>
  mattbenjamin Matt Benjamin <mbenjami@redhat.com>
++baruza Barbora Ančincová <bara@redhat.com>