]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 53728ae 86a0e87)
Merge PR #32505 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 14 Jan 2020 22:29:24 +0000 (14:29 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 14 Jan 2020 22:29:24 +0000 (14:29 -0800)
* refs/pull/32505/head:
mds: note client features when rejecting client
mds: add hex indicator to printed feature flags

Reviewed-by: Zheng Yan <zyan@redhat.com>
1  2 
src/mds/Server.cc patch | diff1 | diff2 | blob | history
src/mds/mdstypes.cc patch | diff1 | diff2 | blob | history

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