]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #22485 into master
authorSage Weil <sage@redhat.com>
Sat, 9 Jun 2018 19:21:37 +0000 (14:21 -0500)
committerSage Weil <sage@redhat.com>
Sat, 9 Jun 2018 19:21:37 +0000 (14:21 -0500)
* refs/pull/22485/head:
qa: wait longer for osd to flush pg stats

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

Trivial merge