]> 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: e4ff472 3b99013)
Merge branch 'next'
authorKen Dreyer <ken.dreyer@inktank.com>
Mon, 3 Feb 2014 22:39:26 +0000 (22:39 +0000)
committerKen Dreyer <ken.dreyer@inktank.com>
Mon, 3 Feb 2014 22:39:26 +0000 (22:39 +0000)
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.