]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #23226 from liewegas/wip-23220-mimic
authorYuri Weinstein <yweinste@redhat.com>
Wed, 22 Aug 2018 20:46:01 +0000 (13:46 -0700)
committerGitHub <noreply@github.com>
Wed, 22 Aug 2018 20:46:01 +0000 (13:46 -0700)
mimic: osd/OSDMap: CRUSH_TUNABLES5 added in jewel, not kraken

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/osd/OSDMap.cc

Simple merge