]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #16778 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 7 Sep 2017 04:05:18 +0000 (21:05 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Thu, 7 Sep 2017 04:05:18 +0000 (21:05 -0700)
* refs/remotes/upstream/pull/16778/head:
mds: fix return value of MDCache::dump_cache
mds: new cap message flags indicate if there is pending capsnap
mds: properly do null snapflush part2
mds: track snap inodes through sorted map
mds: properly drop wrlock when finishing snapflush

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/client/Client.cc

Simple merge