]> 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: f9cf935 450f337)
Merge PR #24566 into master
authorSage Weil <sage@redhat.com>
Tue, 16 Oct 2018 19:34:19 +0000 (14:34 -0500)
committerSage Weil <sage@redhat.com>
Tue, 16 Oct 2018 19:34:19 +0000 (14:34 -0500)
commit8e2ed7796c88aec03322f396b75446e4435088e0
tree92b5c49e8d529f6eb75a144f4f7489b79565b4d0tree | snapshot
parentf9cf93584f94a70435552e5284a8a6c217fc26dfcommit | diff
parent450f337d6fd048c8c95a0ec0dec0d97f5474922ecommit | diff
Merge PR #24566 into master

* refs/pull/24566/head:
osd,mon: keep last_epoch_started along with last_epoch_clean premerge

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
src/mon/OSDMonitor.cc diff1 | diff2 | blob | history
src/osd/OSD.cc diff1 | diff2 | blob | history
src/osd/OSD.h diff1 | diff2 | blob | history
src/osd/PG.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.