]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f1c2dd0 1896b70)
Merge PR #35344 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Mon, 8 Jun 2020 18:25:34 +0000 (11:25 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Mon, 8 Jun 2020 18:25:34 +0000 (11:25 -0700)
commit67f58e52729af8f49de862764f69e898fba27d19
treebee5f289788f3a65dbbf8e20c71619f3d803b766tree | snapshot
parentf1c2dd07851a42ebe66e6772701fa443cdd0e77bcommit | diff
parent1896b70f5ec94f124eaa74fcbf10be44df768408commit | diff
Merge PR #35344 into master

* refs/pull/35344/head:
vstart: Support deployment of ganesha daemon by cephadm with NFS option.
mgr/test_orchestrator: List nfs daemon

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Unnamed repository; edit this file 'description' to name the repository.