]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-rados-bench'
authorSage Weil <sage@redhat.com>
Wed, 3 Feb 2016 14:46:12 +0000 (09:46 -0500)
committerSage Weil <sage@redhat.com>
Wed, 3 Feb 2016 14:46:12 +0000 (09:46 -0500)

Trivial merge