]> 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: d07100b 2738d02)
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)
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
1  2 
src/osd/PGBackend.h patch | diff1 | diff2 | blob | history
src/osd/ReplicatedPG.h patch | diff1 | diff2 | blob | history

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