From: Sage Weil <sage@newdream.net>
Date: Sat, 21 Oct 2017 04:10:06 +0000 (-0500)
Subject: Merge pull request #18362 from kmroz/wip-21543-luminous
X-Git-Tag: v12.2.2~130
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d4158133f7586472d01d9c6e669db92ddcd2e73d;p=ceph.git

Merge pull request #18362 from kmroz/wip-21543-luminous

luminous: qa/tasks: prolong revive_osd() timeout to 6 min
---

d4158133f7586472d01d9c6e669db92ddcd2e73d