]> 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: 09d0c8a 65064ca)
Merge pull request #6240 from xiexingguo/xxg-wip-13471
authorSage Weil <sage@redhat.com>
Sat, 24 Oct 2015 12:30:47 +0000 (08:30 -0400)
committerSage Weil <sage@redhat.com>
Sat, 24 Oct 2015 12:30:47 +0000 (08:30 -0400)
osd:  primary and up_primary when building a new past_interval

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/osd/OSD.cc patch | diff1 | diff2 | blob | history

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