]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #22838 into master
authorSage Weil <sage@redhat.com>
Fri, 10 Aug 2018 21:32:34 +0000 (16:32 -0500)
committerSage Weil <sage@redhat.com>
Fri, 10 Aug 2018 21:32:34 +0000 (16:32 -0500)
* refs/pull/22838/head:
kv/RocksDBStore: Handle nullptr if clock cache is chosen.
kv/rocksdb_cache/BinnedLRUCache: Don't promote data to the high pri pool.
src/kv: Initial import of a custom RocksDB cache.
src/rocksdb: switch back to master branch.

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/common/options.cc
src/kv/CMakeLists.txt
src/kv/RocksDBStore.cc

Simple merge
Simple merge
Simple merge