]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-crushtool' into next
authorSage Weil <sage@inktank.com>
Thu, 20 Dec 2012 16:53:19 +0000 (08:53 -0800)
committerSage Weil <sage@inktank.com>
Thu, 20 Dec 2012 16:53:19 +0000 (08:53 -0800)
Reviewed-by: Caleb Miles <caleb.miles@inktank.com>

Trivial merge