]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0ae9a8 f97b399)
Merge branch 'jewel' into wip-18308-jewel 12591/head
authorjtlayton <jlayton@redhat.com>
Tue, 20 Dec 2016 20:36:39 +0000 (15:36 -0500)
committerGitHub <noreply@github.com>
Tue, 20 Dec 2016 20:36:39 +0000 (15:36 -0500)
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.