]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bdf1653 9202285)
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)
commitc6eb1c4a5aae28ded5cd30fb92c3e981bcbb9246
treeb08a9901b514a3f32b72e74196afd0b0db825cfetree | snapshot
parentbdf1653ec946312fe91b53a466adf991b566f66fcommit | diff
parent9202285b44ce144864a80cb063269f863bb7d6dacommit | diff
Merge PR #22838 into master

* 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>
src/common/options.cc diff1 | diff2 | blob | history
src/kv/CMakeLists.txt diff1 | diff2 | blob | history
src/kv/RocksDBStore.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.