]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #23220 into master
authorSage Weil <sage@redhat.com>
Wed, 25 Jul 2018 12:00:23 +0000 (07:00 -0500)
committerSage Weil <sage@redhat.com>
Wed, 25 Jul 2018 12:00:23 +0000 (07:00 -0500)
commit25ed405ee56ef9936662d92fb473286d13c5312a
tree0250ddcee4b17240d217b9a5791ba1f60cb6b317
parentb8f079a653c4d86357b759e54c3a26b7f691e3b5
parent7e9d24d0602abefa4cca245f5f86dcd4b412b97a
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>