]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7a8daf 4d905d5)
Merge PR #24145 into master
authorSage Weil <sage@redhat.com>
Wed, 19 Sep 2018 14:40:24 +0000 (09:40 -0500)
committerSage Weil <sage@redhat.com>
Wed, 19 Sep 2018 14:40:24 +0000 (09:40 -0500)
* refs/pull/24145/head:
qa/workunits/mon/caps.sh: wait longer to time out

Reviewed-by: João Eduardo Luís <joao@suse.de>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.