]> 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: d0f4d2d e20ef4b)
Merge branch 'wip-client-readdir-fix' of git://github.com/ukernel/ceph into jewel
authorGreg Farnum <gfarnum@redhat.com>
Wed, 6 Jan 2016 21:31:39 +0000 (13:31 -0800)
committerGreg Farnum <gfarnum@redhat.com>
Wed, 6 Jan 2016 21:31:39 +0000 (13:31 -0800)
Reviewed-by: Greg Farnum <gfarnum@redhat.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.