]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-crush' into next
authorSage Weil <sage@inktank.com>
Tue, 27 Nov 2012 17:28:18 +0000 (09:28 -0800)
committerSage Weil <sage@inktank.com>
Tue, 27 Nov 2012 17:28:18 +0000 (09:28 -0800)

Trivial merge