]> 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: f04c8da a6ba518)
Merge remote-tracking branch 'upstream/master' 5528/head
authorblinke <Burkhard.Linke@computational.bio.uni-giessen.de>
Tue, 11 Aug 2015 11:41:44 +0000 (13:41 +0200)
committerblinke <Burkhard.Linke@computational.bio.uni-giessen.de>
Tue, 11 Aug 2015 11:41:44 +0000 (13:41 +0200)
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.