]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e9fbb47 4e87709)
Merge PR #24555 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 1 Nov 2018 21:58:23 +0000 (14:58 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Thu, 1 Nov 2018 21:58:23 +0000 (14:58 -0700)
* refs/pull/24555/head:
doc: document optional timeout argument for `cache drop`
mds: make timeout parameter optional for "cache drop"

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/mds/MDSDaemon.cc patch | diff1 | diff2 | blob | history

diff --cc src/mds/MDSDaemon.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.