From: Kefu Chai <tchaikov@gmail.com>
Date: Mon, 20 Nov 2017 14:55:06 +0000 (+0800)
Subject: Merge pull request #19025 from tchaikov/wip-pr-19024-luminous
X-Git-Tag: v12.2.2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5a469c0376e299e5c60d7d9b3c16640515b11f26;p=ceph.git

Merge pull request #19025 from tchaikov/wip-pr-19024-luminous

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

Reviewed-by: Sage Weil <sage@redhat.com>
---

5a469c0376e299e5c60d7d9b3c16640515b11f26