From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 7 Jul 2017 04:32:45 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/pull/13770/head' into master
X-Git-Tag: v12.1.1~153
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2cb42a4dbf17b3238b41a07601f2f579712da3bf;p=ceph.git

Merge remote-tracking branch 'upstream/pull/13770/head' into master

* upstream/pull/13770/head:
  tasks/cephfs: add TestStrays.test_replicated_delete_speed

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

2cb42a4dbf17b3238b41a07601f2f579712da3bf