From: Sage Weil <sage@redhat.com>
Date: Wed, 3 Feb 2016 14:46:12 +0000 (-0500)
Subject: Merge branch 'wip-rados-bench'
X-Git-Tag: v10.0.4~69
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cc2ce6ad1a9e3d5b8459d3a9df4abda346bda849;p=ceph.git

Merge branch 'wip-rados-bench'
---

cc2ce6ad1a9e3d5b8459d3a9df4abda346bda849