]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commitba055a743cccd387f27535568d67ed00030e9b7a
tree339cd63740967fe1c2b3c90fc8f52a4342a0c226
parentf5909c2078e80606e3694c490446dca4872282ab
parente01a3403c07ca2f0a0fe0aff3a79b920c776ba15
Merge PR #38121 into master

* refs/pull/38121/head:
client: do not unset the client_debug_inject_tick_delay

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