]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #6398 from SUSE/wip-13588-hammer
authorLoic Dachary <loic@dachary.org>
Wed, 11 Nov 2015 05:58:55 +0000 (06:58 +0100)
committerLoic Dachary <loic@dachary.org>
Wed, 11 Nov 2015 05:58:55 +0000 (06:58 +0100)
OSD::build_past_intervals_parallel() shall reset primary and up_primary when begin a new past_interval.

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

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