]> 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: a490d1e c9825f0)
Merge branch 'master' of ceph.newdream.net:git/ceph
authorSage Weil <sage@newdream.net>
Thu, 28 Apr 2011 00:08:49 +0000 (17:08 -0700)
committerSage Weil <sage@newdream.net>
Thu, 28 Apr 2011 00:08:49 +0000 (17:08 -0700)

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