From: Kefu Chai <kchai@redhat.com>
Date: Wed, 5 Feb 2020 12:44:58 +0000 (+0800)
Subject: Merge pull request #32982 from krig/cephadm-fixes
X-Git-Tag: v15.1.1~543
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=068d72230dfdb1bc26b3fbbff1b5624d799cbade;p=ceph.git

Merge pull request #32982 from krig/cephadm-fixes

cephadm: Read ceph version from io.ceph.version label if set

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

068d72230dfdb1bc26b3fbbff1b5624d799cbade