From: wusui <warren.usui@inktank.com>
Date: Fri, 25 Apr 2014 23:20:20 +0000 (-0700)
Subject: Merge pull request #1727 from ceph/wip-8193
X-Git-Tag: v0.80~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=58d7640d25963690400643ad9bf6d1b3f9897f37;p=ceph.git

Merge pull request #1727 from ceph/wip-8193

ceph_test_rados_api_tier: increase HitSetTrim timeouts
---

58d7640d25963690400643ad9bf6d1b3f9897f37