]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fb1fdf4 1bcd319)
Merge pull request #33740 from lxbsz/qa_test_timeout_failed
authorGregory Farnum <gfarnum@redhat.com>
Fri, 27 Mar 2020 19:55:20 +0000 (12:55 -0700)
committerGitHub <noreply@github.com>
Fri, 27 Mar 2020 19:55:20 +0000 (12:55 -0700)
qa/test_config_session_timeout: fix options conflicting

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>
1  2 
qa/tasks/vstart_runner.py patch | diff1 | diff2 | blob | history

diff --cc qa/tasks/vstart_runner.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.