]> 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: bf9c9d0 7e53473)
Merge branch 'master' of https://github.com/ceph/ceph
authorWido den Hollander <wido@42on.com>
Fri, 15 Nov 2013 11:46:04 +0000 (12:46 +0100)
committerWido den Hollander <wido@42on.com>
Fri, 15 Nov 2013 11:46:04 +0000 (12:46 +0100)

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