]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02afcb2 61030e6)
Merge pull request #4653 from ceph/wip-client-misc
authorGregory Farnum <greg@gregs42.com>
Fri, 15 May 2015 17:33:31 +0000 (10:33 -0700)
committerGregory Farnum <greg@gregs42.com>
Fri, 15 May 2015 17:33:31 +0000 (10:33 -0700)
Wip client misc

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
1  2 
src/client/Client.cc patch | diff1 | diff2 | blob | history
src/client/Client.h patch | diff1 | diff2 | blob | history

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