]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit95dbff79fd007b7625eaf6ec3240af93dd2430d4
treed9090d77b89eee72c6492d0dcd7f9e0dfc82eee0tree | snapshot
parente784b697b4f37d1afa1c1c501b9142074a7b2831commit | diff
parentcfc3e6429fc5324164da71a3ddb6bbf83871b32dcommit | diff
Merge PR #26513 into master

* 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>
src/osd/PG.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.