]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'upstream/wip-txn-noappend-sam-rebased'
authorSamuel Just <sjust@redhat.com>
Fri, 29 May 2015 21:20:29 +0000 (14:20 -0700)
committerSamuel Just <sjust@redhat.com>
Fri, 29 May 2015 21:20:29 +0000 (14:20 -0700)
commit33150c509d33ca0fad8f19d2d9e43fe7dad57b24
tree6e7a25572039a9bb682203ff030e1326dc83e9fe
parentd07100b6606e791c878a1e4e1ec804f5438a1f5c
parent2738d02bef7972f55a3df45b5b1c841bd7738f40
Merge remote-tracking branch 'upstream/wip-txn-noappend-sam-rebased'

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
src/osd/PGBackend.h
src/osd/ReplicatedPG.h