]> 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: 9cf7cbd 088b8c2)
Merge remote-tracking branch 'origin/jewel'
authorGreg Farnum <gfarnum@redhat.com>
Wed, 6 Jan 2016 21:48:06 +0000 (13:48 -0800)
committerGreg Farnum <gfarnum@redhat.com>
Wed, 6 Jan 2016 21:48:06 +0000 (13:48 -0800)
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.