]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8dd801d c9681fd)
Merge pull request #6439 from XinzeChi/wip-merge-tnx
authorSage Weil <sage@redhat.com>
Sun, 15 Nov 2015 02:40:42 +0000 (21:40 -0500)
committerSage Weil <sage@redhat.com>
Sun, 15 Nov 2015 02:40:42 +0000 (21:40 -0500)
osd: merge local_t and op_t txn to single one

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/ReplicatedBackend.cc patch | diff1 | diff2 | blob | history

diff --cc src/osd/ReplicatedBackend.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.