]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #20289 from smithfarm/wip-21239-jewel
authorNathan Cutler <presnypreklad@gmail.com>
Thu, 22 Feb 2018 16:03:00 +0000 (17:03 +0100)
committerGitHub <noreply@github.com>
Thu, 22 Feb 2018 16:03:00 +0000 (17:03 +0100)
jewel: test_health_warnings.sh can fail

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/osd/OSD.cc

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