]> 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: a3fcf90 056e91e)
Merge branch 'sync2' into unstable
authorSage Weil <sage@newdream.net>
Tue, 14 Dec 2010 20:47:40 +0000 (12:47 -0800)
committerSage Weil <sage@newdream.net>
Tue, 14 Dec 2010 20:47:40 +0000 (12:47 -0800)

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