]> 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: e784b69 cfc3e64)
Merge PR #26513 into master
authorSage Weil <sage@redhat.com>
Thu, 21 Feb 2019 03:36:31 +0000 (21:36 -0600)
committerSage Weil <sage@redhat.com>
Thu, 21 Feb 2019 03:36:31 +0000 (21:36 -0600)
* refs/pull/26513/head:
osd/PG: fix comments in merge_from
osd/PG: align past_intervals and last_epoch_clean for fabricated merge target

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Neha Ojha <nojha@redhat.com>
1  2 
src/osd/PG.cc patch | diff1 | diff2 | blob | history

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