]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
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)
* 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>
1  2 
src/common/options.cc
src/os/bluestore/BlueStore.cc

Simple merge
Simple merge