From: Sage Weil Date: Fri, 10 Aug 2018 21:32:34 +0000 (-0500) Subject: Merge PR #22838 into master X-Git-Tag: v14.0.1~619 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c6eb1c4a5aae28ded5cd30fb92c3e981bcbb9246;p=ceph.git 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 --- c6eb1c4a5aae28ded5cd30fb92c3e981bcbb9246