From: Sage Weil <sage@redhat.com>
Date: Mon, 30 Jul 2018 13:45:17 +0000 (-0500)
Subject: Merge PR #22607 into master
X-Git-Tag: v14.0.1~741
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c13aa38175ab232d503d019deefd44ee3f9c322c;p=ceph.git

Merge PR #22607 into master

* refs/pull/22607/head:
	common/options: convert many TYPE_[U]INT -> TYPE_SIZE
	common/options: remove journal_max_corrupt_search

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
---

c13aa38175ab232d503d019deefd44ee3f9c322c