From: Sage Weil <sage@redhat.com>
Date: Thu, 25 Oct 2018 15:32:20 +0000 (-0500)
Subject: Merge PR #24731 into master
X-Git-Tag: v14.1.0~1095
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7a0f8854f2210dfcb7fc7c966d59291aacd28d52;p=ceph.git

Merge PR #24731 into master

* refs/pull/24731/head:
	rados: fix admin/build-doc warnings

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
---

7a0f8854f2210dfcb7fc7c966d59291aacd28d52