]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 184773d 3448d85)
Merge remote-tracking branch 'wonzhq/req-pending' into giant
authorSamuel Just <sam.just@inktank.com>
Fri, 19 Sep 2014 20:42:16 +0000 (13:42 -0700)
committerSamuel Just <sam.just@inktank.com>
Fri, 19 Sep 2014 20:42:16 +0000 (13:42 -0700)
1  2 
src/osd/ReplicatedPG.cc patch | diff1 | diff2 | blob | history
src/osd/osd_types.h patch | diff1 | diff2 | blob | history

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