]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b43f26c 920ef96)
Merge PR #24023 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sun, 16 Sep 2018 22:01:01 +0000 (15:01 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Sun, 16 Sep 2018 22:01:01 +0000 (15:01 -0700)
* refs/pull/24023/head:
mds: prevent rctime from going back

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/mds/Locker.cc patch | diff1 | diff2 | blob | history
src/mds/Server.cc patch | diff1 | diff2 | blob | history

diff --cc src/mds/Locker.cc
Simple merge
diff --cc src/mds/Server.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.