]> 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: f046f14 6e1d7c4)
Merge PR #25973 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sun, 20 Jan 2019 01:18:08 +0000 (17:18 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Sun, 20 Jan 2019 01:18:08 +0000 (17:18 -0800)
* refs/pull/25973/head:
qa: use simpler fs fail to bring fs down
MDSMonitor: add fs fail command

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Douglas Fuller <dfuller@redhat.com>
1  2 
doc/cephfs/administration.rst patch | diff1 | diff2 | blob | history
src/mon/MonCommands.h patch | diff1 | diff2 | blob | history

diff --cc doc/cephfs/administration.rst
Simple merge
diff --cc src/mon/MonCommands.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.