From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 19 Apr 2018 21:59:19 +0000 (-0700)
Subject: Merge PR #21434 into master
X-Git-Tag: v13.1.0~184
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9b2a919d70813d66473daabca7e91d5dc2bbf18d;p=ceph.git

Merge PR #21434 into master

* refs/pull/21434/head:
	client: add client option descriptions

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
---

9b2a919d70813d66473daabca7e91d5dc2bbf18d