]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #24455 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 17 Oct 2018 17:17:29 +0000 (10:17 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 17 Oct 2018 17:17:29 +0000 (10:17 -0700)
commit6345c3f80d990b3d0c9ae7515219d168ca2468b5
treee547fdbd701d08fdb0d3b714cc48d8ba872dd5cd
parentc24d8d47d549523a524ee094a661f545cba5db45
parent296d89b0463ee3aad8dfb50b0e41a27e2c852ddb
Merge PR #24455 into master

* refs/pull/24455/head:
qa: use timeout for fs asok operations

Reviewed-by: Jeff Layton <jlayton@redhat.com>