]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-2209' into next
authorDavid Zafman <david.zafman@inktank.com>
Tue, 30 Apr 2013 17:52:23 +0000 (10:52 -0700)
committerDavid Zafman <david.zafman@inktank.com>
Tue, 30 Apr 2013 17:55:12 +0000 (10:55 -0700)
Reviewed-by: Samuel Just <sam.just@inktank.com>

Trivial merge