]> 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: 58a6bcb 5e18903)
Merge PR #25652 into master
authorSage Weil <sage@redhat.com>
Tue, 1 Jan 2019 04:30:40 +0000 (22:30 -0600)
committerSage Weil <sage@redhat.com>
Tue, 1 Jan 2019 04:30:40 +0000 (22:30 -0600)
commit49eab70fbcfeaca5420d79891f570fa7e55f0827
treeaaf7f60fd1097e50d11188e40e2d42b23125e599tree | snapshot
parent58a6bcb748063af74e2532843b9b03072a6c3adecommit | diff
parent5e189036ded094254b0b013fd75ebdca65a02d6ecommit | diff
Merge PR #25652 into master

* refs/pull/25652/head:
osd/OSDMap: disallow new upmaps on pgs that are pending merge
osd/PG: align past_intervals and last_epoch_clean for fabricated merge target

Reviewed-by: Neha Ojha <nojha@redhat.com>
src/osd/OSDMap.cc diff1 | diff2 | blob | history
src/osd/PG.cc diff1 | diff2 | blob | history
src/osd/osd_types.cc diff1 | diff2 | blob | history
src/osd/osd_types.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.