]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-4748-b' into next
authorSage Weil <sage@inktank.com>
Thu, 25 Apr 2013 17:21:11 +0000 (10:21 -0700)
committerSage Weil <sage@inktank.com>
Thu, 25 Apr 2013 17:21:11 +0000 (10:21 -0700)
Reviewed-by: Greg Farnum <greg@inktank.com>

Trivial merge