]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e60190b 7a921c0)
Merge PR #36580 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 4 Sep 2020 17:40:46 +0000 (10:40 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 4 Sep 2020 17:40:46 +0000 (10:40 -0700)
* refs/pull/36580/head:
Client: defer puting the inode
client: defer cancelling the timer event
client: remove _sync_write_commit which makes no sense any more

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

diff --cc src/client/Client.cc
Simple merge
diff --cc src/client/Client.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.