]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commit826d36dea823011964d4bf9f93af0610d4b36b88
tree3ed34f595c08b80ce4053a8f69c04c6cb6a2a500
parent80819bebaabe47b922118d3edbc71499b37320d7
parent16b84f7332fe42c5ca3e378cf23b2fe0185cccc6
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>