]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #6397 from SUSE/wip-13615-infernalis
authorSage Weil <sage@redhat.com>
Mon, 8 Feb 2016 13:49:41 +0000 (08:49 -0500)
committerSage Weil <sage@redhat.com>
Mon, 8 Feb 2016 13:49:41 +0000 (08:49 -0500)
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