]> 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: cf0ad85 813dc29)
Merge branch 'unstable' into io
authorSage Weil <sage@newdream.net>
Wed, 2 Apr 2008 22:36:44 +0000 (15:36 -0700)
committerSage Weil <sage@newdream.net>
Wed, 2 Apr 2008 22:36:44 +0000 (15:36 -0700)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.