]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #21923 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 11 May 2018 21:57:36 +0000 (14:57 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 11 May 2018 21:57:36 +0000 (14:57 -0700)
commit52707c33fe0e4712592c79e540c6653ffadb9482
tree3ad5f1a8253b2118a7faafbf2659744916626397
parentaffb0f87b567bea10199bb81902605b69072a489
parent46b4e6afa631058fe066bfd58c76d644d5c2181d
Merge PR #21923 into master

* refs/pull/21923/head:
mds: set could_consume to false when no purge queue item actually executed

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