]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commitbb55d6c0c3543ff435eb40f4efe0e69fe3c1851d
tree14f75bfbabda24126a692b2108bc82ff2e174d0f
parent41d59fcc3b353f22c8c8c07bd78738c04c41dc7a
parentd18cf51d9419819cdda3782b188b010969288911
Merge pull request #6036 from liewegas/wip-13116

osd: fix replay requeue when pg is activating

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