]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-6242-b' into next
authorSage Weil <sage@inktank.com>
Tue, 22 Oct 2013 20:32:01 +0000 (13:32 -0700)
committerSage Weil <sage@inktank.com>
Tue, 22 Oct 2013 20:32:01 +0000 (13:32 -0700)
Reviewed-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>

Trivial merge