]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 41d59fc d18cf51)
Merge pull request #6036 from liewegas/wip-13116
authorSamuel Just <sam.just@inktank.com>
Wed, 30 Sep 2015 00:19:12 +0000 (17:19 -0700)
committerSamuel Just <sam.just@inktank.com>
Wed, 30 Sep 2015 00:19:12 +0000 (17:19 -0700)
osd: fix replay requeue when pg is activating

Reviewed-by: Samuel Just <sjust@redhat.com>
1  2 
src/osd/OSD.cc patch | diff1 | diff2 | blob | history
src/osd/PG.cc patch | diff1 | diff2 | blob | history
src/osd/PG.h patch | diff1 | diff2 | blob | history

diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.