From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 23 Aug 2017 17:54:30 +0000 (-0700)
Subject: Merge PR #17150 into master
X-Git-Tag: v13.0.0~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=019eefa84f1979baf68faba2187a7d034ecba035;p=ceph.git

Merge PR #17150 into master

* refs/remotes/upstream/pull/17150/head:
	doc/cephfs: s/rados_max_object_size/osd_max_object_size

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

019eefa84f1979baf68faba2187a7d034ecba035