From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 8 Mar 2021 19:40:04 +0000 (-0800)
Subject: Merge PR #39906 into octopus
X-Git-Tag: v15.2.10~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=74ec64a2a496a5ca02c674061ceec5d64c952381;p=ceph.git

Merge PR #39906 into octopus

* refs/pull/39906/head:
	mgr/volumes: Bump up AuthMetadataManager's version
	pybind/ceph_volume_client: Bump up the version and compat_version to 6
	pybind/ceph_volume_client: Fix auth-metadata file recovery
	pybind/ceph_volume_client: Update the 'volumes' key to 'subvolumes' in auth metadata file

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

74ec64a2a496a5ca02c674061ceec5d64c952381