]> 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: 1d7460a cfae10b)
Merge commit 'cfae10b8f8b0d91f37dc6eb72f3b3f8285bb15e7' into tests-broken-2
authorTommi Virtanen <tv@hq.newdream.net>
Fri, 14 Jan 2011 23:04:16 +0000 (15:04 -0800)
committerTommi Virtanen <tv@hq.newdream.net>
Fri, 14 Jan 2011 23:04:16 +0000 (15:04 -0800)
1  2 
src/cauthtool.cc patch | diff1 | diff2 | blob | history

diff --cc src/cauthtool.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.