]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fdeb67c 84004e8)
Merge pull request #34799 from smithfarm/wip-44844-octopus
authorRamana Raja <rraja@redhat.com>
Thu, 7 May 2020 14:35:37 +0000 (20:05 +0530)
committerGitHub <noreply@github.com>
Thu, 7 May 2020 14:35:37 +0000 (20:05 +0530)
octopus: qa/test_config_session_timeout: fix options conflicting

Reviewed-by: Ramana Raja <rraja@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.