]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #31778 into master
authorSage Weil <sage@redhat.com>
Sun, 24 Nov 2019 02:30:28 +0000 (20:30 -0600)
committerSage Weil <sage@redhat.com>
Sun, 24 Nov 2019 02:30:28 +0000 (20:30 -0600)
* refs/pull/31778/head:
os/bluestore: pin onodes as they are added to the cache
Revert "Revert "Merge pull request #30964 from markhpc/wip-bs-cache-trim-pinned""

Reviewed-by: Mark Nelson <mnelson@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/common/options.cc
src/osd/OSD.cc
src/osd/OSD.h

Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge