]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #25544 into master
authorSage Weil <sage@redhat.com>
Thu, 10 Jan 2019 15:54:00 +0000 (09:54 -0600)
committerSage Weil <sage@redhat.com>
Thu, 10 Jan 2019 15:54:00 +0000 (09:54 -0600)
* refs/pull/25544/head:
common/PriorityCache: Automatic chunk sizing

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/common/options.cc
src/kv/KeyValueDB.h
src/kv/RocksDBStore.cc
src/os/bluestore/BlueStore.cc
src/os/bluestore/BlueStore.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge