]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
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)
commitb39a40241857ee222b5e993928b1d65a74ce88f5
tree74479d9f2241a0ca4cbe49795501b6814ac1ccd1
parentba548ffe2624c52bf6d451ab6934b36b91221616
parent2b98f4701e9a12e50f8d017c93e5101eb02f7992
Merge PR 16068 into master

* 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>
src/mds/Locker.cc
src/mds/Locker.h
src/mds/MDCache.cc
src/mds/PurgeQueue.cc