]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
projects / ceph-client.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 360f654 1bdfd55)
Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Sun, 1 Oct 2006 03:55:03 +0000 (23:55 -0400)
committerJeff Garzik <jeff@garzik.org>
Sun, 1 Oct 2006 03:55:03 +0000 (23:55 -0400)

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