From: Sage Weil <sage@redhat.com>
Date: Sat, 9 Jun 2018 19:21:37 +0000 (-0500)
Subject: Merge PR #22485 into master
X-Git-Tag: v14.0.1~1147
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=826d36dea823011964d4bf9f93af0610d4b36b88;p=ceph.git

Merge PR #22485 into master

* refs/pull/22485/head:
	qa: wait longer for osd to flush pg stats

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

826d36dea823011964d4bf9f93af0610d4b36b88