]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #19277 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Mon, 18 Dec 2017 00:08:22 +0000 (16:08 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Mon, 18 Dec 2017 00:08:22 +0000 (16:08 -0800)
* refs/pull/19277/head:
cephfs: potential adjust failure in lru_expire

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>

Trivial merge