]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR 16068 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 18 Jul 2017 05:33:51 +0000 (22:33 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 18 Jul 2017 05:33:51 +0000 (22:33 -0700)
* refs/remotes/upstream/pull/16068/head:
mds: wait auth pinned objects when deactivating mds
mds: fix "wait for stray manager to start"
ceph: kick purge queue when mds active
mds: properly do null snapflush
mds: force client to flush data when waiting on LOCK_SNAP_SYNC lock
mds: don't issue caps for frozen inode

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/mds/Locker.cc
src/mds/Locker.h
src/mds/MDCache.cc
src/mds/PurgeQueue.cc

Simple merge
Simple merge
Simple merge
Simple merge