]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #18316 into luminous
authorPatrick Donnelly <pdonnell@redhat.com>
Sun, 29 Oct 2017 18:06:24 +0000 (11:06 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Sun, 29 Oct 2017 18:06:24 +0000 (11:06 -0700)
* refs/pull/18316/head:
mds: prevent trim count from underflowing

Reviewed-by: Zheng Yan <zyan@redhat.com>
1  2 
src/mds/MDCache.cc

Simple merge