]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #6401 from SUSE/wip-13620-hammer
authorLoic Dachary <loic@dachary.org>
Mon, 16 Nov 2015 17:05:39 +0000 (18:05 +0100)
committerLoic Dachary <loic@dachary.org>
Mon, 16 Nov 2015 17:05:39 +0000 (18:05 +0100)
osd: pg stuck in replay

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

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