]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-4783'
authorDavid Zafman <david.zafman@inktank.com>
Thu, 16 May 2013 00:18:41 +0000 (17:18 -0700)
committerDavid Zafman <david.zafman@inktank.com>
Thu, 16 May 2013 00:18:41 +0000 (17:18 -0700)
Reviewed-by: Sam Just <sam.just@inktank.com>

Trivial merge