From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 4 Nov 2020 00:22:32 +0000 (-0800)
Subject: Merge PR #37881 into master
X-Git-Tag: v16.1.0~697
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f372aad22b448acd3f13b9e2150a8d61273e2f9e;p=ceph.git

Merge PR #37881 into master

* refs/pull/37881/head:
	doc/mgr/orchestrator: Update about nfs add in rook
	mgr/rook: Refactor nfs add/apply methods
	mgr/rook: Udpate to mypy py3 type style in _create(), _update() and apply()
	mgr/rook: Remove unused 'current' argument from update_func method

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Travis Nielsen <tnielsen@redhat.com>
---

f372aad22b448acd3f13b9e2150a8d61273e2f9e