]> 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: 86b4317 58e920b)
Merge branch 'wip-3346'
authorSam Lang <sam.lang@inktank.com>
Fri, 19 Oct 2012 03:14:24 +0000 (22:14 -0500)
committerSam Lang <sam.lang@inktank.com>
Fri, 19 Oct 2012 03:14:24 +0000 (22:14 -0500)
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.