]> 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: 8f07729 15775f8)
Merge branch 'master' of https://github.com/ceph/ceph
authorJohn Wilkins <john.wilkins@inktank.com>
Wed, 10 Oct 2012 21:38:50 +0000 (14:38 -0700)
committerJohn Wilkins <john.wilkins@inktank.com>
Wed, 10 Oct 2012 21:38:50 +0000 (14:38 -0700)
Signed-off-by: John Wilkins <john.wilkins@inktank.com>

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