From: Sage Weil <sage@redhat.com>
Date: Fri, 20 Dec 2019 21:43:04 +0000 (-0600)
Subject: Merge PR #32272 into master
X-Git-Tag: v15.1.0~408
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=137eea43dce5bd22b1e18dcac82b689650989944;p=ceph.git

Merge PR #32272 into master

* 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>
---

137eea43dce5bd22b1e18dcac82b689650989944