]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #38121 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 25 Nov 2020 21:30:04 +0000 (13:30 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 25 Nov 2020 21:30:04 +0000 (13:30 -0800)
* refs/pull/38121/head:
client: do not unset the client_debug_inject_tick_delay

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/client/Client.cc

Simple merge