]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d238b9 d74a7c1)
Merge branch 'jewel-13903' of git://github.com/ukernel/ceph into greg-fs-testing
authorGreg Farnum <gfarnum@redhat.com>
Tue, 26 Jan 2016 19:00:24 +0000 (11:00 -0800)
committerGreg Farnum <gfarnum@redhat.com>
Tue, 26 Jan 2016 19:00:24 +0000 (11:00 -0800)
https://github.com/ceph/ceph/pull/7297

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.