]> 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: a67afa4 31284f7)
Merge branch 'master' of github.com:ceph/ceph
authorPeter Reiher <reiher@inktank.com>
Fri, 26 Oct 2012 22:32:48 +0000 (15:32 -0700)
committerPeter Reiher <reiher@inktank.com>
Fri, 26 Oct 2012 22:32:48 +0000 (15:32 -0700)

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