]> 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: 2779325 2a5549c)
Merge branch 'next'
authorJosh Durgin <josh.durgin@inktank.com>
Wed, 5 Dec 2012 23:55:35 +0000 (15:55 -0800)
committerJosh Durgin <josh.durgin@inktank.com>
Wed, 5 Dec 2012 23:55:35 +0000 (15:55 -0800)

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