]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed7ebf3 7a8ab74)
Merge branch 'stable'
authorSage Weil <sage@newdream.net>
Tue, 30 Aug 2011 20:15:00 +0000 (13:15 -0700)
committerSage Weil <sage@newdream.net>
Tue, 30 Aug 2011 20:15:00 +0000 (13:15 -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.