]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-client-io-final'
authorSamuel Just <sam.just@inktank.com>
Wed, 22 Jan 2014 22:52:39 +0000 (14:52 -0800)
committerSamuel Just <sam.just@inktank.com>
Wed, 22 Jan 2014 22:52:39 +0000 (14:52 -0800)
Reviewed-by: Greg Farnum <greg@inktank.com>
Reviewed-by: David Zafman <david.zafman@inktank.com>

Trivial merge