]> 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: 1bd5d24 07029a4)
Merge branch 'master' of github.com:ceph/ceph
authorcaleb miles <caselim@gmail.com>
Tue, 26 Jun 2012 06:14:09 +0000 (23:14 -0700)
committercaleb miles <caselim@gmail.com>
Tue, 26 Jun 2012 06:14:09 +0000 (23:14 -0700)

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