]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #9103 from Abhishekvrshny/wip-15797-jewel
authorSamuel Just <sjust@redhat.com>
Thu, 9 Jun 2016 22:42:32 +0000 (15:42 -0700)
committerGitHub <noreply@github.com>
Thu, 9 Jun 2016 22:42:32 +0000 (15:42 -0700)
jewel: deadlock in OSD::_committed_osd_maps

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

diff --cc src/osd/OSD.cc
Simple merge