]> 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: 6d72a1f 69288ce)
Merge remote-tracking branch 'gh/hammer'
authorSage Weil <sage@redhat.com>
Fri, 6 Feb 2015 11:04:09 +0000 (03:04 -0800)
committerSage Weil <sage@redhat.com>
Fri, 6 Feb 2015 11:04:09 +0000 (03:04 -0800)
1  2 
src/client/Client.cc patch | diff1 | diff2 | blob | history
src/osd/ReplicatedPG.cc patch | diff1 | diff2 | blob | history

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