]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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>

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