]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commit4432aa5f26f371843ea6f622a89ae52e5a891e72
treea65ff2acb86e8adcb94025dba6e6454d00004b55
parenta58a29e0bf063f1c5c0a36e09eb9d9b6d22073ce
parentfdf6b38a4941eb70dff8b3b95030916eb25728da
Merge PR #24748 into master

* refs/pull/24748/head:
qa: use 6h timeout for pjd test

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