]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
projects / ceph-ci.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 139becb 25bf65e)
Merge PR #26796 into master
authorSage Weil <sage@redhat.com>
Fri, 8 Mar 2019 14:11:47 +0000 (08:11 -0600)
committerSage Weil <sage@redhat.com>
Fri, 8 Mar 2019 14:11:47 +0000 (08:11 -0600)
commitb88a10aef2894768bc383e67c39dbe504e5c10f0
tree54b020d20f4010f3f6b90a1b9d72d5628d5194bdtree | snapshot
parent139becb6c1ee14a2e60b35fbf24ae0489283ee6acommit | diff
parent25bf65e9c30bb51ed10fe8654eec91a2b097ba32commit | diff
Merge PR #26796 into master

* refs/pull/26796/head:
common/options: osd_memory_target et al are TYPE_SIZE

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
src/common/options.cc diff1 | diff2 | blob | history
src/os/bluestore/BlueStore.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.