]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c9ba5d 5d2f3ac)
Merge pull request #35793 from callithea/wip-46183-octopus
authorYuri Weinstein <yweinste@redhat.com>
Wed, 8 Jul 2020 19:34:20 +0000 (12:34 -0700)
committerGitHub <noreply@github.com>
Wed, 8 Jul 2020 19:34:20 +0000 (12:34 -0700)
octopus: mgr/DaemonServer.cc: make 'config show' on fsid work

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.