]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #32272 into master
authorSage Weil <sage@redhat.com>
Fri, 20 Dec 2019 21:43:04 +0000 (15:43 -0600)
committerSage Weil <sage@redhat.com>
Fri, 20 Dec 2019 21:43:04 +0000 (15:43 -0600)
* refs/pull/32272/head:
pybind/mgr: Add orchestrator_cli to mgr/tox.ini
mgr/orchestrator_cli: Fix NFS

Reviewed-by: Sage Weil <sage@redhat.com>

Trivial merge