]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #29537 into master
authorSage Weil <sage@redhat.com>
Thu, 15 Aug 2019 17:26:29 +0000 (12:26 -0500)
committerSage Weil <sage@redhat.com>
Thu, 15 Aug 2019 17:26:29 +0000 (12:26 -0500)
* refs/pull/29537/head:
os/bluestore/BlueFS: fix device_migrate_to_* to handle varying alloc sizes
os/bluestore/BlueFS: apply shared_alloc_size to shared device
os/bluestore: whitespace
os/bluestore/BlueFS: add bluefs_shared_alloc_size
os/bluestore/BlueStore.cc: start should be >= _get_ondisk_reserved()

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
1  2 
src/common/legacy_config_opts.h
src/common/options.cc
src/os/bluestore/BlueStore.cc

Simple merge
Simple merge
Simple merge