]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #9101 from Abhishekvrshny/wip-15799-jewel
authorSamuel Just <sjust@redhat.com>
Thu, 9 Jun 2016 22:41:52 +0000 (15:41 -0700)
committerGitHub <noreply@github.com>
Thu, 9 Jun 2016 22:41:52 +0000 (15:41 -0700)
jewel: osd boot race with noup being set

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

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