]> 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: 77ee6dc bce3a63)
Merge branch 'testing' into unstable
authorSage Weil <sage@newdream.net>
Fri, 6 Aug 2010 18:34:53 +0000 (11:34 -0700)
committerSage Weil <sage@newdream.net>
Fri, 6 Aug 2010 18:34:53 +0000 (11:34 -0700)

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