]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commit193b3002773c056879232cf1becff7b880bd86c1
treeab17db719c3d9d280c58df7bbd0681b29fde8157
parent9aaf672c66d9fe8cde61875fd77ae416a5af872c
parent7139a232d26beef441ffbc13bc087baab3505ea8
Merge pull request #7483 from liewegas/wip-osd-boot

osd: resolve boot vs NOUP set + clear race

Reviewed-by: Samuel Just <sjust@redhat.com>
src/osd/OSD.cc
src/osd/OSD.h