]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c6e25f 4eb4827)
Merge PR #19825 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 30 Jan 2018 23:18:01 +0000 (15:18 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 30 Jan 2018 23:18:01 +0000 (15:18 -0800)
* refs/pull/19825/head:
client: properly choose target mds for rmsnap/renamesnap
mds: properly setup need_snapflush for snapped inode
mds: ignore MClientCaps::FLAG_NO_CAPSNAP

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/client/Client.cc patch | diff1 | diff2 | blob | history
src/mds/Locker.cc patch | diff1 | diff2 | blob | history
src/messages/MClientCaps.h patch | diff1 | diff2 | blob | history

diff --cc src/client/Client.cc
Simple merge
diff --cc src/mds/Locker.cc
Simple merge
diff --cc src/messages/MClientCaps.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.