]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1b612f 78648b2)
Merge branch 'unstable' of ceph.newdream.net:/git/ceph into unstable
authorGreg Farnum <gregf@hq.newdream.net>
Mon, 28 Sep 2009 20:55:03 +0000 (13:55 -0700)
committerGreg Farnum <gregf@hq.newdream.net>
Mon, 28 Sep 2009 20:55:03 +0000 (13:55 -0700)
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.