]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7239e80 84c7a34)
Merge branch 'wip-oc-neg'
authorSage Weil <sage@inktank.com>
Mon, 29 Oct 2012 19:37:08 +0000 (12:37 -0700)
committerSage Weil <sage@inktank.com>
Mon, 29 Oct 2012 19:37:08 +0000 (12:37 -0700)
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
1  2 
src/client/Client.cc patch | diff1 | diff2 | blob | history

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