]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9aaf672 7139a23)
Merge pull request #7483 from liewegas/wip-osd-boot
authorSamuel Just <sjust@redhat.com>
Fri, 11 Mar 2016 19:03:58 +0000 (11:03 -0800)
committerSamuel Just <sjust@redhat.com>
Fri, 11 Mar 2016 19:03:58 +0000 (11:03 -0800)
osd: resolve boot vs NOUP set + clear race

Reviewed-by: Samuel Just <sjust@redhat.com>
1  2 
src/osd/OSD.cc patch | diff1 | diff2 | blob | history
src/osd/OSD.h patch | diff1 | diff2 | blob | history

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