]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #21992 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sun, 16 Sep 2018 21:30:28 +0000 (14:30 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Sun, 16 Sep 2018 21:30:28 +0000 (14:30 -0700)
* refs/pull/21992/head:
qa: extend timeout for SessionMap flush

Reviewed-by: John Spray <john.spray@redhat.com>

Trivial merge