]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #7421 from Abhishekvrshny/wip-14494-infernalis
authorSage Weil <sage@redhat.com>
Mon, 8 Feb 2016 13:47:36 +0000 (08:47 -0500)
committerSage Weil <sage@redhat.com>
Mon, 8 Feb 2016 13:47:36 +0000 (08:47 -0500)
infernalis: pgs stuck inconsistent after infernalis upgrade

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/OSD.cc

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