]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #24748 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 7 Dec 2018 18:50:57 +0000 (10:50 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 7 Dec 2018 18:50:57 +0000 (10:50 -0800)
* refs/pull/24748/head:
qa: use 6h timeout for pjd test

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Trivial merge