]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-3678-b' into next
authorSage Weil <sage@inktank.com>
Mon, 7 Jan 2013 21:04:13 +0000 (13:04 -0800)
committerSage Weil <sage@inktank.com>
Mon, 7 Jan 2013 21:04:13 +0000 (13:04 -0800)
Reviewed-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>

Trivial merge