]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-5784' into next
authorDavid Zafman <david.zafman@inktank.com>
Thu, 1 Aug 2013 04:24:28 +0000 (21:24 -0700)
committerDavid Zafman <david.zafman@inktank.com>
Thu, 1 Aug 2013 04:25:20 +0000 (21:25 -0700)
Reviewed-by: Samuel Just <sam.just@inktank.com>

Trivial merge