]> 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: 71c7315 1eb6511)
Merge PR #38693 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 8 Jan 2021 18:47:07 +0000 (10:47 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 8 Jan 2021 18:47:07 +0000 (10:47 -0800)
* refs/pull/38693/head:
qa: execute scrubs only on rank 0
client: print debug information about resolved MDS
qa: let Client::resolve_mds lookup the rank

Reviewed-by: Xiubo Li <xiubli@redhat.com>
1  2 
qa/tasks/cephfs/filesystem.py patch | diff1 | diff2 | blob | history
src/client/Client.cc patch | diff1 | diff2 | blob | history

diff --cc qa/tasks/cephfs/filesystem.py
Simple merge
diff --cc src/client/Client.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.