]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-4390-b'
authorSage Weil <sage@inktank.com>
Wed, 13 Mar 2013 23:37:29 +0000 (16:37 -0700)
committerSage Weil <sage@inktank.com>
Wed, 13 Mar 2013 23:37:29 +0000 (16:37 -0700)
Reviewed-by: Greg Farnum <greg@inktank.com>

Trivial merge