]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 84f90a0 326dd34)
Merge branch 'next'
authorJosh Durgin <josh.durgin@inktank.com>
Wed, 12 Dec 2012 00:47:41 +0000 (16:47 -0800)
committerJosh Durgin <josh.durgin@inktank.com>
Wed, 12 Dec 2012 00:47:41 +0000 (16:47 -0800)

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