]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-7875'
authorSage Weil <sage@inktank.com>
Thu, 27 Mar 2014 23:39:36 +0000 (16:39 -0700)
committerSage Weil <sage@inktank.com>
Thu, 27 Mar 2014 23:39:36 +0000 (16:39 -0700)
Reviewed-by: Samuel Just <sam.just@inktank.com>

Trivial merge