]> 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: 01f0818 51d8e24)
Merge PR #24780 into master
authorSage Weil <sage@redhat.com>
Sun, 28 Oct 2018 14:39:50 +0000 (09:39 -0500)
committerSage Weil <sage@redhat.com>
Sun, 28 Oct 2018 14:39:50 +0000 (09:39 -0500)
* refs/pull/24780/head:
osd: take heartbeat_lock before checking for session
Merge PR #24725 into nautilus
qa/tasks/qemu: use unique clone directory to avoid race with workunit
mds: add missing mds_lock

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
1  2 
src/mds/MDSDaemon.cc patch | diff1 | diff2 | blob | history
src/osd/OSD.cc patch | diff1 | diff2 | blob | history

diff --cc src/mds/MDSDaemon.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.