]> 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: 2069d58 4940ab6)
Merge PR #34507 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Mon, 25 May 2020 18:44:55 +0000 (11:44 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Mon, 25 May 2020 18:44:55 +0000 (11:44 -0700)
commitc9977e1252dd3be8c212bb42268ed7d25304ad13
treec946d174a729b79c10fd250e047b0d8b18ad7836tree | snapshot
parent2069d58e4366cc67538bdc95d91a02a20f1f983ecommit | diff
parent4940ab62e0d19ce36e53bcc67b2a2161c47f6c6dcommit | diff
Merge PR #34507 into master

* refs/pull/34507/head:
mds: preserve ESlaveUpdate::OP_PREPARE logevent before doing commit

Reviewed-by: Zheng Yan <zyan@redhat.com>
src/mds/MDCache.cc diff1 | diff2 | blob | history
src/mds/MDCache.h diff1 | diff2 | blob | history
src/mds/Server.cc diff1 | diff2 | blob | history
src/mds/journal.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.