]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #39906 into octopus
authorPatrick Donnelly <pdonnell@redhat.com>
Mon, 8 Mar 2021 19:40:04 +0000 (11:40 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Mon, 8 Mar 2021 19:40:04 +0000 (11:40 -0800)
* 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>

Trivial merge