]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c87619 a88d096)
Merge PR #32334 into master
authorSage Weil <sage@redhat.com>
Sat, 21 Dec 2019 02:41:07 +0000 (20:41 -0600)
committerSage Weil <sage@redhat.com>
Sat, 21 Dec 2019 02:41:07 +0000 (20:41 -0600)
* refs/pull/32334/head:
cephadm: add some coarse-grained locking
cephadm: add FileLock class

Reviewed-by: Michael Fritch <mfritch@suse.com>
1  2 
src/cephadm/cephadm patch | diff1 | diff2 | blob | history

diff --cc src/cephadm/cephadm
Simple merge
Unnamed repository; edit this file 'description' to name the repository.