From: Josh Durgin <jdurgin@redhat.com>
Date: Sat, 12 Mar 2016 01:20:47 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/wip-josh-testing'
X-Git-Tag: v10.1.0~133
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4a7212257f571aa6f2a1170e1c235524bb832943;p=ceph.git

Merge remote-tracking branch 'origin/wip-josh-testing'
---

4a7212257f571aa6f2a1170e1c235524bb832943