From: Gregory Farnum <gfarnum@redhat.com>
Date: Fri, 27 Mar 2020 19:55:20 +0000 (-0700)
Subject: Merge pull request #33740 from lxbsz/qa_test_timeout_failed
X-Git-Tag: v16.1.0~2763
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ca240372771e6b6b5de7610132fe3624d7d94c3e;p=ceph.git

Merge pull request #33740 from lxbsz/qa_test_timeout_failed

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>
---

ca240372771e6b6b5de7610132fe3624d7d94c3e