]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bf9790e da52b5e)
Merge branch 'wip-13569' of git://github.com/ukernel/ceph into greg-fs-testing
authorGreg Farnum <gfarnum@redhat.com>
Wed, 13 Jan 2016 02:37:56 +0000 (18:37 -0800)
committerGreg Farnum <gfarnum@redhat.com>
Thu, 14 Jan 2016 18:26:21 +0000 (10:26 -0800)
https://github.com/ceph/ceph/pull/6463

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.