From: Sage Weil <sage@redhat.com>
Date: Sat, 21 Dec 2019 02:41:07 +0000 (-0600)
Subject: Merge PR #32334 into master
X-Git-Tag: v15.1.0~402
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d39ecb12a0eeb1f7110b4da343f7e0837f0a4551;p=ceph.git

Merge PR #32334 into master

* refs/pull/32334/head:
	cephadm: add some coarse-grained locking
	cephadm: add FileLock class

Reviewed-by: Michael Fritch <mfritch@suse.com>
---

d39ecb12a0eeb1f7110b4da343f7e0837f0a4551