]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-8100'
authorDavid Zafman <david.zafman@inktank.com>
Wed, 16 Apr 2014 22:09:09 +0000 (15:09 -0700)
committerDavid Zafman <david.zafman@inktank.com>
Wed, 16 Apr 2014 22:09:12 +0000 (15:09 -0700)
Reviewed-by: Mark Nelson <mark.nelson@inktank.com>

Trivial merge