git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8dd801d c9681fd)

author	Sage Weil <sage@redhat.com>
	Sun, 15 Nov 2015 02:40:42 +0000 (21:40 -0500)
committer	Sage Weil <sage@redhat.com>
	Sun, 15 Nov 2015 02:40:42 +0000 (21:40 -0500)
commit	b9251b4b6fee45b092e446301f5183873158bcc7
tree	d43256430af7ebc5cb7f938d1f44d54b0ad64b12	tree \| snapshot
parent	8dd801d86dbf144349b792816dc298b3e68555b5	commit \| diff
parent	c9681fd98d066d833cf93af03644fd3c8e46edbd	commit \| diff

Merge pull request #6439 from XinzeChi/wip-merge-tnx

osd: merge local_t and op_t txn to single one

Reviewed-by: Sage Weil <sage@redhat.com>

src/osd/ReplicatedBackend.cc

Unnamed repository; edit this file 'description' to name the repository.