]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d7c18c1 5e454bb)
Merge branch 'wip-crushwrapper2'
authorSage Weil <sage@inktank.com>
Fri, 29 Jun 2012 19:34:13 +0000 (12:34 -0700)
committerSage Weil <sage@inktank.com>
Fri, 29 Jun 2012 19:34:13 +0000 (12:34 -0700)
Reviewed-by: Sage Weil <sage@inktank.com>

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