From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sun, 10 Dec 2017 00:34:24 +0000 (-0800)
Subject: Merge PR #19373 into master
X-Git-Tag: v13.0.2~826
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d2ebe22a49885243cdaa67d0d999e7a8868435fc;p=ceph.git

Merge PR #19373 into master

* refs/pull/19373/head:
	client: drop duplicate friend

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

d2ebe22a49885243cdaa67d0d999e7a8868435fc