From: Sage Weil <sage@redhat.com>
Date: Wed, 25 Jul 2018 12:00:23 +0000 (-0500)
Subject: Merge PR #23220 into master
X-Git-Tag: v14.0.1~785
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=25ed405ee56ef9936662d92fb473286d13c5312a;p=ceph-ci.git

Merge PR #23220 into master

* refs/pull/23220/head:
	osd/OSDMap: CRUSH_TUNABLES5 added in jewel, not kraken

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

25ed405ee56ef9936662d92fb473286d13c5312a