]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b8f079a 7e9d24d)
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)
* refs/pull/23220/head:
osd/OSDMap: CRUSH_TUNABLES5 added in jewel, not kraken

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.