From: John Spray <jcspray@gmail.com>
Date: Tue, 3 Mar 2015 11:42:09 +0000 (+0000)
Subject: Merge pull request #358 from ceph/wip-10712
X-Git-Tag: v10.2.6~165^2^2~532
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=386b6feaaf67f647a2e6cae9619d6f4d953ff033;p=ceph.git

Merge pull request #358 from ceph/wip-10712

tasks: fix intermittent failure in TestFlush

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
---

386b6feaaf67f647a2e6cae9619d6f4d953ff033