]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-5194' into next
authorSage Weil <sage@inktank.com>
Mon, 17 Jun 2013 22:46:47 +0000 (15:46 -0700)
committerSage Weil <sage@inktank.com>
Mon, 17 Jun 2013 22:46:47 +0000 (15:46 -0700)
Reviewed-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Gary Lowell <gary.lowell@inktank.com>

Trivial merge