]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-5848-coll'
authorDavid Zafman <david.zafman@inktank.com>
Fri, 16 Aug 2013 01:32:30 +0000 (18:32 -0700)
committerDavid Zafman <david.zafman@inktank.com>
Fri, 16 Aug 2013 01:32:34 +0000 (18:32 -0700)
Reviewed-by: Sage Weil <sage@inktank.com>

Trivial merge