]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR 16337 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 21 Jul 2017 20:23:04 +0000 (13:23 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 21 Jul 2017 20:23:04 +0000 (13:23 -0700)
* refs/remotes/upstream/pull/16337/head:
mds: clear dirty rstat flag on non-auth inode when finishing scatter update

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

Simple merge